540 files changed, 218456 insertions, 79222 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
index d528f9c..ec20977 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -1,10 +1,11 @@
-Notes on the Free Translation Project
-*************************************
+1 Notes on the Free Translation Project
+***************************************
 
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
 
    If you found this `ABOUT-NLS' file inside a distribution, you may
 assume that the distributed package does use GNU `gettext' internally,
@@ -15,17 +16,17 @@ this package with messages translated.
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
+work on translations can contact the appropriate team.
 
    When reporting bugs in the `intl/' directory or bugs which may be
 related to internationalization, you should tell about the version of
 `gettext' which is used.  The information can be found in the
 `intl/VERSION' file, in internationalized packages.
 
-Quick configuration advice
-==========================
+1.1 Quick configuration advice
+==============================
 
-   If you want to exploit the full power of internationalization, you
+If you want to exploit the full power of internationalization, you
 should configure it using
 
      ./configure --with-included-gettext
@@ -45,37 +46,37 @@ to change to GNU `gettext' as soon as possible.
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 
-INSTALL Matters
-===============
+1.2 INSTALL Matters
+===================
 
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
 
      ./configure --with-included-gettext
      ./configure --disable-nls
 
-will respectively bypass any pre-existing `gettext' to use the
+will, respectively, bypass any pre-existing `gettext' to use the
 internationalizing routines provided within this package, or else,
 _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
 probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
 
      ./configure --with-included-gettext
 
@@ -86,7 +87,7 @@ and therefore it will not be used.  The reason is that even an
 emulation of `gettext' on top of `catgets' could not provide all the
 extensions of the GNU `gettext' library.
 
-   Internationalized packages have usually many `po/LL.po' files, where
+   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
 translations have been forbidden at `configure' time by using the
 `--disable-nls' switch, all available translations are installed
@@ -95,10 +96,10 @@ may be set, prior to configuration, to limit the installed set.
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-Using This Package
-==================
+1.3 Using This Package
+======================
 
-   As a user, if your language has been installed for this package, you
+As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
 `LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
 and `CC' is an ISO 3166 two-letter country code.  For example, let's
@@ -117,8 +118,8 @@ country code serves to distinguish the dialects.
 language and `CC' denoting the country, is the one use on systems based
 on GNU libc.  On other systems, some variations of this scheme are
 used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
-locales supported by your system for your country by running the command
-`locale -a | grep '^LL''.
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
 
    Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
@@ -131,16 +132,23 @@ system libraries.  For example, some Swedish users who would rather
 read translations in German than English for when Swedish is not
 available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
 
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
    In the `LANGUAGE' environment variable, but not in the `LANG'
 environment variable, `LL_CC' combinations can be abbreviated as `LL'
 to denote the language's main dialect.  For example, `de' is equivalent
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-Translating Teams
-=================
+1.4 Translating Teams
+=====================
 
-   For the Free Translation Project to be a success, we need interested
+For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
@@ -164,239 +172,897 @@ get started, please write to `translation@iro.umontreal.ca' to reach the
 coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
 
-Available Packages
-==================
+1.5 Available Packages
+======================
 
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of August
-2002.  The matrix shows, in regard of each package, for which languages
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files    be bg ca cs da de el en eo es et fi fr
-                     +----------------------------------------+
-     a2ps            |             [] []             []    [] |
-     ap-utils        |                                        |
-     bash            |                []       [] []       [] |
-     bfd             |                            []       [] |
-     binutils        |                            []       [] |
-     bison           |                []          [] []    [] |
-     clisp           |                                        |
-     clisp           |                []    []    []       [] |
-     clisplow        |                                        |
-     cpio            |             [] []          []       [] |
-     darkstat        |             ()                         |
-     diffutils       |          [] [] []       [] []       [] |
-     enscript        |                []                   [] |
-     error           |                []          []       [] |
-     fetchmail       |       [] () [] []          []       () |
-     fileutils       |             [] []          [] []    [] |
-     findutils       |             [] []       [] [] []    [] |
-     flex            |       []    [] []          []       [] |
-     gas             |                            []       [] |
-     gawk            |                []          []       [] |
-     gcal            |       []                            [] |
-     gcc             |                            []       [] |
-     gettext         |       []    [] []          []       [] |
-     gnupg           |       []       [] []    [] [] []    [] |
-     gprof           |                            []       [] |
-     gpsdrive        |             () ()    ()    ()       () |
-     grep            |    [] []       [] []       [] [] [] [] |
-     gretl           |                            []          |
-     gthumb          |                ()          ()       () |
-     hello           |       []    [] [] []    [] [] [] [] [] |
-     id-utils        |             [] []                   [] |
-     indent          |       []       []       []    []    [] |
-     jpilot          |          () [] []                   [] |
-     jwhois          |                            []       [] |
-     kbd             |                []          []       [] |
-     ld              |                            []       [] |
-     libc            |       [] [] [] [] []       []    [] [] |
-     libiconv        |       []       []       [] []          |
-     lifelines       |                ()                   () |
-     lilypond        |             []                      [] |
-     lingoteach      |                         []          [] |
-     lingoteach_lessons|                ()          ()          |
-     lynx            |       [] [] [] []             []       |
-     m4              |          [] [] [] []                [] |
-     make            |             [] []          []       [] |
-     man-db          |       [] () () []          ()       () |
-     mysecretdiary   |                []          []       [] |
-     nano            |       [] () [] []          []       [] |
-     nano_1_0        |       [] () [] []          []       [] |
-     opcodes         |             []             []       [] |
-     parted          |       []    [] []          []       [] |
-     ptx             |             [] []       [] [] [] [] [] |
-     python          |                                        |
-     recode          |             [] [] []    [] []       [] |
-     sed             |       [] [] [] [] []    [] [] [] [] [] |
-     sh-utils        |                []          [] []    [] |
-     sharutils       |          [] [] [] []       [] []    [] |
-     sketch          |                ()          []       () |
-     soundtracker    |                []          []       [] |
-     sp              |                []                      |
-     tar             |          [] [] []          [] []    [] |
-     texinfo         |          [] [] []       []          [] |
-     textutils       |       []    [] []          []       [] |
-     util-linux      |          [] [] []          [] []    [] |
-     vorbis-tools    |                                     [] |
-     wastesedge      |                                        |
-     wdiff           |       []    [] []          [] []    [] |
-     wget            |    [] [] [] [] [] []       [] [] [] [] |
-                     +----------------------------------------+
-                       be bg ca cs da de el en eo es et fi fr
-                        0  2 19 10 30 44  9  1 12 44 17  6 53
-     
-                       gl he hr hu id it ja ko lv nb nl nn
-                     +-------------------------------------+
-     a2ps            |                ()    ()       []    |
-     ap-utils        |                                     |
-     bash            |          []                         |
-     bfd             |                   []                |
-     binutils        |                   []                |
-     bison           |       []       [] []          []    |
-     clisp           |                                     |
-     clisp           |                               []    |
-     clisplow        |                                     |
-     cpio            | []       []          []       []    |
-     darkstat        |                                     |
-     diffutils       | [] []    [] []    []                |
-     enscript        |       []                      []    |
-     error           |          []                         |
-     fetchmail       |                   []                |
-     fileutils       |          []    [] []                |
-     findutils       | []    [] [] [] [] [] []       []    |
-     flex            |                      []             |
-     gas             |                                     |
-     gawk            |    []                               |
-     gcal            |                                     |
-     gcc             |                   []                |
-     gettext         |                   [] []             |
-     gnupg           | []          [] [] []                |
-     gprof           |             []                      |
-     gpsdrive        |          []    ()             ()    |
-     grep            | [] [] [] [] [] [] []                |
-     gretl           |                                     |
-     gthumb          |                () ()                |
-     hello           | [] [] [] [] [] [] [] [] [] [] [] [] |
-     id-utils        |          []                   []    |
-     indent          | []       []       []          []    |
-     jpilot          |                   ()          ()    |
-     jwhois          |          [] []                      |
-     kbd             |                                     |
-     ld              |                                     |
-     libc            | []                [] []    []       |
-     libiconv        | []    [] []                         |
-     lifelines       |                                     |
-     lilypond        |                               []    |
-     lingoteach      |          []                         |
-     lingoteach_lessons|                                     |
-     lynx            |          []    [] []          []    |
-     m4              | []          []    []          []    |
-     make            | [] [] []          [] []       []    |
-     man-db          |                () ()                |
-     mysecretdiary   |             []                      |
-     nano            | []          [] []             []    |
-     nano_1_0        | []          [] []          []    [] |
-     opcodes         |             []                []    |
-     parted          | []                []             [] |
-     ptx             | []       [] []             [] []    |
-     python          |                                     |
-     recode          | [] []          []                   |
-     sed             | [] [] []    [] [] [] []       []    |
-     sh-utils        |                [] []       []       |
-     sharutils       | []                []          []    |
-     sketch          |                ()                   |
-     soundtracker    | []    []                            |
-     sp              |                                     |
-     tar             | []    []    [] [] []       []       |
-     texinfo         |    [] []          []                |
-     textutils       | []                [] []    []       |
-     util-linux      |                () []                |
-     vorbis-tools    |          []                         |
-     wastesedge      |                                     |
-     wdiff           | []       [] []                      |
-     wget            | [] [] [] []       []          []    |
-                     +-------------------------------------+
-                       gl he hr hu id it ja ko lv nb nl nn
-                       23  9 12 19 16 13 26  9  1  7 19  3
-     
-                       no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW
-                     +----------------------------------------------+
-     a2ps            | () () ()  []   []    [] [] []                | 10
-     ap-utils        |                               ()             |  0
-     bash            |           []                                 |  6
-     bfd             |                         [] []                |  5
-     binutils        |                         [] []                |  5
-     bison           |           []   []       [] []                | 12
-     clisp           |                                              |  0
-     clisp           |                                              |  5
-     clisplow        |                                              |  0
-     cpio            |    []     []   []       []                   | 12
-     darkstat        |           []            []        ()    ()   |  2
-     diffutils       |    []     []   []       [] []           []   | 17
-     enscript        |           []   []       [] []                |  8
-     error           |                   []       []           []   |  7
-     fetchmail       |    ()     ()               []                |  6
-     fileutils       |                []    [] [] []     []    []   | 14
-     findutils       |    []     []   [] [] [] [] []                | 21
-     flex            |                []       [] []                |  9
-     gas             |                            []                |  3
-     gawk            |                         [] []                |  6
-     gcal            |                         [] []                |  4
-     gcc             |                            []                |  4
-     gettext         |                [] [] [] [] []           []   | 13
-     gnupg           |    []                   [] []                | 14
-     gprof           |                         [] []                |  5
-     gpsdrive        |                   []    []                   |  3
-     grep            |    []     []   []    []    []                | 20
-     gretl           |                                              |  1
-     gthumb          |           ()   ()       []                   |  1
-     hello           | [] []          [] []    [] [] []             | 28
-     id-utils        |           []   []       [] []                |  9
-     indent          |           []   [] []    [] []                | 14
-     jpilot          | ()                      () []           []   |  5
-     jwhois          |           []   ()       () []           []   |  7
-     kbd             |                         [] []                |  5
-     ld              |                         [] []                |  4
-     libc            | [] []     []      []    [] []                | 18
-     libiconv        |           []   [] []    [] []                | 12
-     lifelines       |                         []                   |  1
-     lilypond        |                         []                   |  4
-     lingoteach      |           []            []                   |  5
-     lingoteach_lessons|                                   ()         |  0
-     lynx            |           []   []       [] []                | 13
-     m4              |    []     []   []       []                   | 13
-     make            |    []     []   []       [] []                | 15
-     man-db          |                                              |  3
-     mysecretdiary   |           []            [] []                |  7
-     nano            |    []          []       []    []             | 13
-     nano_1_0        |    []          []       []    []             | 14
-     opcodes         |           []            [] []                |  8
-     parted          |       []  []            [] []                | 12
-     ptx             | [] [] []  []   []       [] []                | 19
-     python          |                                              |  0
-     recode          |    []     []   []    [] [] []                | 15
-     sed             |           []   [] [] [] [] []                | 24
-     sh-utils        |                []          []                |  9
-     sharutils       |                []       [] []           []   | 14
-     sketch          |           []   ()       []                   |  4
-     soundtracker    |                         []                   |  6
-     sp              |                                              |  1
-     tar             | [] []     []      [] [] [] []                | 19
-     texinfo         |                []       []                   | 10
-     textutils       |                []    [] [] []           []   | 14
-     util-linux      |           []            [] []                | 10
-     vorbis-tools    |                         []                   |  3
-     wastesedge      |                                              |  0
-     wdiff           |           []   [] []    [] []                | 14
-     wget            |    []          [] [] [] [] [] []        []   | 24
-                     +----------------------------------------------+
-       37 teams        no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW
-       68 domains       4 15  2  28   28 12 10 49 43  4   1     9    609
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     GNUnet             |                                  []                |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                      []          []             [] |
+     batchelor          |                                  []                |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                               []                   |
+     bison              |                               [] []                |
+     bison-runtime      |                                                    |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                                  []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    []          []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     darkstat           |                []             () []                |
+     dialog             |                      [] [] [] [] [] []             |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     error              |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []             |
+     fileutils          |                               [] []                |
+     findutils          |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                  []                |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gbiff              |                                  []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gimp-print         |                         []    [] []        []      |
+     gip                |                []                                  |
+     gliv               |                                  []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                                  () ()     []      |
+     gnucash-glossary   |                               [] ()                |
+     gnuedu             |                                                    |
+     gnulib             | []          [] []    []       [] []                |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                                    |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                  ()    ()          |
+     gramadoir          | []                               []                |
+     grep               | []          [] []    []          [] []             |
+     gretl              |                                                    |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins        | []                   [] []    []                   |
+     gst-plugins-base   |                []    []       []                   |
+     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |                         []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     id-utils           |                               [] []                |
+     impost             |                                                    |
+     indent             |                      []          []             [] |
+     iso_3166           |                                  []             [] |
+     iso_3166_2         |                                                    |
+     iso_4217           |                                  []                |
+     iso_639            |                                  []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                                                    |
+     keytouch-editor    |                                                    |
+     keytouch-keyboa... |                                                    |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] [] []             |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                               []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      [] ()    [] []                |
+     minicom            |                         []    [] []                |
+     mysecretdiary      |                               [] []                |
+     nano               |                []    []          []                |
+     nano_1_0           |                      [] ()    [] []                |
+     opcodes            |                                  []                |
+     parted             |                                                    |
+     pilot-qof          |                                            []      |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     python             |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                         []    []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     sh-utils           |                               [] []                |
+     shared-mime-info   |                []       []                 []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     silky              |                                                    |
+     skencil            |                               [] ()                |
+     sketch             |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     stardict           |                         []                         |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                                  |
+     texinfo            |                               [] []             [] |
+     textutils          |                      []       [] []                |
+     tin                |                                  ()        ()      |
+     tp-robot           |                                  []                |
+     tuxpaint           | []             []             [] []        []      |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     vorbis-tools       |             []          []    []           []      |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      []          []                |
+     xchat              |             [] []    []          [] []     []      |
+     xkeyboard-config   |                                                    |
+     xpad               |                []             []                   |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []             []                    []          |
+     batchelor          |                []  []                            |
+     bfd                | []                                               |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     darkstat           | []             ()  []                [] []       |
+     dialog             | [] [] []    [] []  []                []       [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     error              | []          [] []  []                []          |
+     fetchmail          | []                                               |
+     fileutils          | [] []          []  []                []       [] |
+     findutils          |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                []                                |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                   |
+     gbiff              |                []                                |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []             []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []             []                             [] |
+     gimp-print         | []             []                                |
+     gip                | []    []       []                                |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnucash-glossary   | []                                            [] |
+     gnuedu             | []                                               |
+     gnulib             | [] [] []    [] []  [] []             []          |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []             []  []                   []       |
+     gpsdrive           | ()             ()                    []       () |
+     gramadoir          |                []  []                            |
+     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
+     gretl              | []             []                             [] |
+     gsasl              |                    []                   []       |
+     gss                |                []                                |
+     gst-plugins        |                []                    []       [] |
+     gst-plugins-base   |                                      []       [] |
+     gst-plugins-good   |       []                             []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |                    []                            |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                         [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     id-utils           |                []  []                [] []    [] |
+     impost             |                []  []                            |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_3166           |             [] []                    []          |
+     iso_3166_2         |                []                                |
+     iso_4217           |    []       []        []             []          |
+     iso_639            |          [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                    []                            |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                            |
+     latrine            |                []  []                         [] |
+     ld                 | []             []                                |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                                                  |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []              []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           |                []                                |
+     lingoteach         |                []                       []    [] |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             | ()                                               |
+     minicom            | []          [] []                    []          |
+     mysecretdiary      | []             []                       []       |
+     nano               | []    []       []  []                []       [] |
+     nano_1_0           | []             []     []                []    [] |
+     opcodes            | []          [] []  []                            |
+     parted             | []             []                       []    [] |
+     pilot-qof          |                                                  |
+     psmisc             |       []                             []       [] |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     sh-utils           | [] []       [] []  []                []       [] |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                                                  |
+     silky              |                []                                |
+     skencil            | []             []                                |
+     sketch             | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     stardict           |                                      []          |
+     system-tools-ba... | []    []    [] []                 [] [] []    [] |
+     tar                | [] []       [] []  []                []       [] |
+     texinfo            |                []           []                   |
+     textutils          | []             []  [] []             []          |
+     tin                |    []          ()                                |
+     tp-robot           |             [] []  []                []          |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     vorbis-tools       | []             []                                |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []    []    [] []        []    []    []       [] |
+     xkeyboard-config   |             [] []                    []       [] |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                        +-------------------------------------------------+
+     GNUnet             |                                                 |
+     a2ps               |    ()                      []          []    () |
+     aegis              |                                        ()       |
+     ant-phone          |                                        []       |
+     anubis             |                            []    []    []       |
+     ap-utils           |                            []                   |
+     aspell             |                         []             []       |
+     bash               |                                        []       |
+     batchelor          |                            []          []       |
+     bfd                |                                                 |
+     bibshelf           |                            []                   |
+     binutils           |                                                 |
+     bison              |                            []    []    []       |
+     bison-runtime      |                            []    []    []       |
+     bluez-pin          |       []                   []          []       |
+     cflow              |                                                 |
+     clisp              |                                        []       |
+     console-tools      |                                                 |
+     coreutils          |                                        []       |
+     cpio               |                                                 |
+     cpplib             |                                        []       |
+     cryptonit          |                                        []       |
+     darkstat           |                            []          []       |
+     dialog             |                            []          []       |
+     diffutils          | []                         []          []       |
+     doodle             |                                                 |
+     e2fsprogs          |                                        []       |
+     enscript           |                                        []       |
+     error              |                                        []       |
+     fetchmail          | []                                     []       |
+     fileutils          | []          []                                  |
+     findutils          |                                        []       |
+     flex               |    []                                  []       |
+     fslint             |                            []          []       |
+     gas                |                                                 |
+     gawk               | []                                     []       |
+     gbiff              |                                        []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gettext-examples   | []                                     []       |
+     gettext-runtime    | [] []                                  []       |
+     gettext-tools      | [] []                                           |
+     gimp-print         | []                                     []       |
+     gip                |                            []          []       |
+     gliv               |                                        []       |
+     glunarclock        |                            []          []       |
+     gmult              | []                         []                   |
+     gnubiff            |                                                 |
+     gnucash            | ()                               ()             |
+     gnucash-glossary   |                                        []       |
+     gnuedu             |                                                 |
+     gnulib             | [] []                      []          []       |
+     gnunet-gtk         |                                                 |
+     gnutls             |                                                 |
+     gpe-aerial         |                                        []       |
+     gpe-beam           |                                        []       |
+     gpe-calendar       | []                                              |
+     gpe-clock          | [] []                                  []       |
+     gpe-conf           |    []                                  []       |
+     gpe-contacts       |    []                                           |
+     gpe-edit           | [] []                                  []       |
+     gpe-filemanager    | [] []                                           |
+     gpe-go             | [] []                                  []       |
+     gpe-login          | [] []                                  []       |
+     gpe-ownerinfo      | []                                     []       |
+     gpe-package        | [] []                                           |
+     gpe-sketchbook     |    []                                  []       |
+     gpe-su             | [] []                                  []       |
+     gpe-taskmanager    | [] [] []                               []       |
+     gpe-timesheet      |                                        []       |
+     gpe-today          | []                                     []       |
+     gpe-todo           | []                                              |
+     gphoto2            | []                                     []       |
+     gprof              |                                                 |
+     gpsdrive           | ()                                     ()    () |
+     gramadoir          |                                        ()       |
+     grep               | []       []                      []    []       |
+     gretl              |                                                 |
+     gsasl              |                                        []       |
+     gss                |                                                 |
+     gst-plugins        |                                        []       |
+     gst-plugins-base   |                                                 |
+     gst-plugins-good   |                                        []       |
+     gstreamer          |                                        []       |
+     gtick              |                                                 |
+     gtkam              | []                                              |
+     gtkorphan          |                                        []       |
+     gtkspell           |                         []             []       |
+     gutenprint         |                                                 |
+     hello              | [] []                      []    []    [] []    |
+     id-utils           |                                        []       |
+     impost             |                                                 |
+     indent             | []                                     []       |
+     iso_3166           |                                        []       |
+     iso_3166_2         |                                        []       |
+     iso_4217           | []                      []             []       |
+     iso_639            | []                                     []       |
+     jpilot             | ()                                     ()    () |
+     jtag               |                                                 |
+     jwhois             |                                        []       |
+     kbd                |                                        []       |
+     keytouch           |                                        []       |
+     keytouch-editor    |                                                 |
+     keytouch-keyboa... |                                                 |
+     latrine            |                                        []       |
+     ld                 |                                                 |
+     leafpad            | []             []                               |
+     libc               | [] []                            []    []    [] |
+     libexif            |                                                 |
+     libextractor       |                                                 |
+     libgpewidget       |                                        []       |
+     libgpg-error       |                                                 |
+     libgphoto2         | []                                              |
+     libgphoto2_port    | []                                              |
+     libgsasl           |                                        []       |
+     libiconv           |                                                 |
+     libidn             | []                                     []       |
+     lifelines          |                                        []       |
+     lilypond           |                                                 |
+     lingoteach         |                                        []       |
+     lynx               | []                                     []       |
+     m4                 | []                                     []       |
+     mailutils          |                                                 |
+     make               | [] []                                  []       |
+     man-db             | ()                                              |
+     minicom            | []                                              |
+     mysecretdiary      |                                        []       |
+     nano               |                            []    []    []       |
+     nano_1_0           |                            []    []       []    |
+     opcodes            |                                        []       |
+     parted             | []                                     []       |
+     pilot-qof          |                                                 |
+     psmisc             | []                               []    []       |
+     pwdutils           |                                                 |
+     python             |                                                 |
+     qof                |                                                 |
+     radius             |                                                 |
+     recode             |                                        []       |
+     rpm                | [] []                                           |
+     screem             | []                                              |
+     scrollkeeper       |                                  [] [] [] []    |
+     sed                | []                                     []       |
+     sh-utils           | []                               []             |
+     shared-mime-info   |    []          []                []    [] []    |
+     sharutils          | []                                     []       |
+     shishi             |                                                 |
+     silky              |                                        []       |
+     skencil            |                                                 |
+     sketch             |                                                 |
+     solfege            |                                                 |
+     soundtracker       |                                                 |
+     sp                 | ()                                              |
+     stardict           |                      []                []       |
+     system-tools-ba... | [] []          []                      []       |
+     tar                | []       []                            []       |
+     texinfo            | []                               []    []       |
+     textutils          | [] []                            []             |
+     tin                |                                                 |
+     tp-robot           |                                        []       |
+     tuxpaint           |                                           []    |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux         | []                                     []       |
+     vorbis-tools       |                                        []       |
+     wastesedge         |                                        []       |
+     wdiff              |                            []    []             |
+     wget               | []                                     []       |
+     xchat              | [] []                []                []       |
+     xkeyboard-config   |                                        []       |
+     xpad               |    []                      []          []       |
+                        +-------------------------------------------------+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +------------------------------------------------------+
+     GNUnet             |                                                      |
+     a2ps               |           ()     []      [] []       []    [] []     |
+     aegis              |                          () ()                       |
+     ant-phone          |                          []                   []     |
+     anubis             |           []             [] []                       |
+     ap-utils           |           ()                                         |
+     aspell             |                          [] []                       |
+     bash               |                  []      [] []                       |
+     batchelor          |                          []                   []     |
+     bfd                |                                                      |
+     bibshelf           |                                               []     |
+     binutils           |                             []                []     |
+     bison              |           []     []      [] []                []     |
+     bison-runtime      |           []             []          []       []     |
+     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
+     cflow              |           []                                         |
+     clisp              |                             []                       |
+     console-tools      |                             []                       |
+     coreutils          |           []                []       []       []     |
+     cpio               |           []                []                []     |
+     cpplib             |                                               []     |
+     cryptonit          |                  []                           []     |
+     darkstat           |           []     []      []       []       [] []     |
+     dialog             |           [] []  []   [] [] [] []          [] []     |
+     diffutils          |           []     []      [] []             [] []     |
+     doodle             |                                         []    []     |
+     e2fsprogs          |           []                                  []     |
+     enscript           |                  []      [] []       []       []     |
+     error              |                  []      []       []          []     |
+     fetchmail          |           []                []          []           |
+     fileutils          |           []             [] []       []       []     |
+     findutils          |           [] []          []       [] []       []     |
+     flex               |           []     []      [] []                []     |
+     fslint             |                  []      []                [] []     |
+     gas                |                                                      |
+     gawk               |           []     []      []                   []     |
+     gbiff              |                          []                          |
+     gcal               |                                               []     |
+     gcc                |                                               []     |
+     gettext-examples   |           [] []          [] []    [] []    [] []     |
+     gettext-runtime    |           [] []          [] []    [] []    [] []     |
+     gettext-tools      |           []             [] []    [] []    [] []     |
+     gimp-print         |                                   []          []     |
+     gip                |                       []          []       [] []     |
+     gliv               |                  []      []       []          []     |
+     glunarclock        |                  []      [] []    []       [] []     |
+     gmult              |                       [] []                [] []     |
+     gnubiff            |                          ()                          |
+     gnucash            |           ()                                  []     |
+     gnucash-glossary   |              []                   []          []     |
+     gnuedu             |                                                      |
+     gnulib             |           []             [] []       []       []     |
+     gnunet-gtk         |                                               []     |
+     gnutls             |           []                                  []     |
+     gpe-aerial         |              []  []      [] []       []    [] []     |
+     gpe-beam           |              []  []      [] []       []    [] []     |
+     gpe-calendar       |                             []                       |
+     gpe-clock          |              []  []      [] []    [] []    [] []     |
+     gpe-conf           |              []  []      [] []    [] []       []     |
+     gpe-contacts       |                          [] []       []    [] []     |
+     gpe-edit           |              []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                      []       []     |
+     gpe-go             |                  []      [] []       []    [] []     |
+     gpe-login          |              []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
+     gpe-package        |                                      []       []     |
+     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
+     gpe-su             |              []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
+     gpe-today          |              []  []      [] []    [] []    [] []     |
+     gpe-todo           |                             []       []    [] []     |
+     gphoto2            |           []             []       []       [] []     |
+     gprof              |                  []      []                   []     |
+     gpsdrive           |        []                []                   []     |
+     gramadoir          |                                   []          []     |
+     grep               |           [] []  []      [] []       []    [] []     |
+     gretl              |           []                                         |
+     gsasl              |           []                               [] []     |
+     gss                |           []             []                   []     |
+     gst-plugins        |     []                                  [] [] []     |
+     gst-plugins-base   |                                               []     |
+     gst-plugins-good   |     []                                  [] [] []     |
+     gstreamer          |                                         [] [] []     |
+     gtick              |                             []                       |
+     gtkam              |           []     []         []                []     |
+     gtkorphan          |                                               []     |
+     gtkspell           |                  []   [] [] []    [] []    [] []     |
+     gutenprint         |                                               []     |
+     hello              |           []     []      [] []    [] []    [] []     |
+     id-utils           |                  []      [] []                []     |
+     impost             |                                               []     |
+     indent             |                  []      [] []    []       [] []     |
+     iso_3166           |              []                []    [] [] [] []     |
+     iso_3166_2         |                                                      |
+     iso_4217           |                                []    []    [] []     |
+     iso_639            |                                []    []    [] []     |
+     jpilot             |                                                      |
+     jtag               |                                   []                 |
+     jwhois             |           []     []      []                   []     |
+     kbd                |           []             []                   []     |
+     keytouch           |                                               []     |
+     keytouch-editor    |                                               []     |
+     keytouch-keyboa... |                                               []     |
+     latrine            |                          []                   []     |
+     ld                 |                                               []     |
+     leafpad            |           [] []             []    []          []  [] |
+     libc               |           []     []         []    []          []     |
+     libexif            |           []                                         |
+     libextractor       |                          []                   []     |
+     libgpewidget       |              []  []      []       [] []    [] []     |
+     libgpg-error       |           []             []                          |
+     libgphoto2         |           []                                         |
+     libgphoto2_port    |           []                []                []     |
+     libgsasl           |           []             []                [] []     |
+     libiconv           |                                      []    []        |
+     libidn             |           []                               [] ()     |
+     lifelines          |           []                                  []     |
+     lilypond           |                                                      |
+     lingoteach         |                  []                                  |
+     lynx               |                  []         []                []     |
+     m4                 |           []     []      [] []                []     |
+     mailutils          |           []             [] []                []     |
+     make               |           []     []         []                []     |
+     man-db             |                          []                   []     |
+     minicom            |           []     []      [] []                []     |
+     mysecretdiary      |                  []      [] []                []     |
+     nano               |                  []      []                   []     |
+     nano_1_0           |           []             [] []                []     |
+     opcodes            |                          []                   []     |
+     parted             |           []                                         |
+     pilot-qof          |                                               []     |
+     psmisc             |           []                                  []     |
+     pwdutils           |           []                                  []     |
+     python             |                                                      |
+     qof                |                  []                           []     |
+     radius             |           []                []                       |
+     recode             |           [] []  []      [] []       []       []     |
+     rpm                |           [] []             []                []     |
+     screem             |                                                      |
+     scrollkeeper       |           []             [] []    []    [] [] []     |
+     sed                |           [] []  []      [] []    [] []    [] []     |
+     sh-utils           |                             []       []    []        |
+     shared-mime-info   |              []  []                     [] [] []     |
+     sharutils          |           []                []             [] []     |
+     shishi             |           []                                         |
+     silky              |                                   []                 |
+     skencil            |              []  []                           []     |
+     sketch             |              []  []                           []     |
+     solfege            |                                               []     |
+     soundtracker       |                                   []          []     |
+     sp                 |                                                      |
+     stardict           |                             []    []          []     |
+     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
+     tar                |           []             [] []       []       []     |
+     texinfo            |           []             [] []                []     |
+     textutils          |                             []       []       []     |
+     tin                |                             ()                       |
+     tp-robot           |                             []                       |
+     tuxpaint           |              []                      [] [] [] []     |
+     unicode-han-tra... |                                                      |
+     unicode-transla... |                                                      |
+     util-linux         |                  []         []       []       []     |
+     vorbis-tools       |                          [] []                       |
+     wastesedge         |                                                      |
+     wdiff              |           []     []      [] []    []          []     |
+     wget               |              []             []    []          []     |
+     xchat              |        []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                                      []       []     |
+     xpad               |                                   [] []       []     |
+                        +------------------------------------------------------+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     GNUnet             |                    []                             |  2
+     a2ps               |          [] []     []                             | 19
+     aegis              |                                                   |  0
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 15
+     bash               |                    []                             | 11
+     batchelor          |          []        []                             |  9
+     bfd                |                                                   |  1
+     bibshelf           |                    []                             |  7
+     binutils           |          []        []                     []      |  9
+     bison              |          []        []                     []      | 19
+     bison-runtime      |                    []         []          []      | 15
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  6
+     console-tools      |          []        []                             |  5
+     coreutils          |          []        []                             | 16
+     cpio               |          [] []     []                             |  9
+     cpplib             |          []        []         []          []      | 11
+     cryptonit          |                                                   |  5
+     darkstat           |                    []         ()          ()      | 15
+     dialog             |          [] []     []         []          []      | 30
+     diffutils          |          []        []         []          []      | 28
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     error              |          []        []         []          []      | 18
+     fetchmail          |          []        []                             | 12
+     fileutils          |          []                   []          []      | 18
+     findutils          |          []        []                     []      | 17
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  9
+     gas                |          []                                       |  3
+     gawk               |          []        []                             | 15
+     gbiff              |                    []                             |  5
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  6
+     gettext-examples   |          [] []     []         []    []    []      | 27
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 19
+     gimp-print         |             []     []                             | 12
+     gip                |                    []                     []      | 12
+     gliv               |          []        []                             |  8
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 15
+     gnubiff            |                    []                             |  1
+     gnucash            |          ()                                       |  2
+     gnucash-glossary   |                    []                     []      |  9
+     gnuedu             |                    []                             |  2
+     gnulib             |          [] []     []         []          []      | 28
+     gnunet-gtk         |                                                   |  1
+     gnutls             |                                                   |  2
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []                             |  3
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []         []                  | 14
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []                 []      | 20
+     gpe-filemanager    |                    []                             |  6
+     gpe-go             |          []        []                             | 15
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []         []                  | 20
+     gpe-taskmanager    |          []        []         []                  | 20
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []                             |  7
+     gphoto2            |             []     []         []          []      | 20
+     gprof              |          []        []                             | 11
+     gpsdrive           |                                                   |  4
+     gramadoir          |                    []                             |  7
+     grep               |          [] []     []                     []      | 34
+     gretl              |                                                   |  4
+     gsasl              |                    []         []                  |  8
+     gss                |                    []                             |  5
+     gst-plugins        |             []     []                     []      | 15
+     gst-plugins-base   |             []     []         []                  |  9
+     gst-plugins-good   |             []     []         []    []    []      | 20
+     gstreamer          |          [] []     []                             | 17
+     gtick              |                    []                             |  3
+     gtkam              |                    []                             | 13
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 26
+     gutenprint         |                                                   |  3
+     hello              |          [] []     []         []          []      | 37
+     id-utils           |          []        []                             | 14
+     impost             |                    []                             |  4
+     indent             |          []        []         []          []      | 25
+     iso_3166           |       [] []        []               []            | 16
+     iso_3166_2         |                                                   |  2
+     iso_4217           |          []        []                             | 14
+     iso_639            |                    []                             | 14
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          []        []                             | 12
+     keytouch           |                    []                             |  4
+     keytouch-editor    |                                                   |  2
+     keytouch-keyboa... |                    []                             |  3
+     latrine            |          []        []                             |  8
+     ld                 |          []        []         []          []      |  8
+     leafpad            |          []        []         []          []      | 23
+     libc               |          []                   []          []      | 23
+     libexif            |                    []                             |  4
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 19
+     libgpg-error       |                    []                             |  4
+     libgphoto2         |             []                                    |  8
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []                             |  7
+     libidn             |                    []         []                  | 10
+     lifelines          |                                                   |  4
+     lilypond           |                                                   |  2
+     lingoteach         |                    []                             |  6
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailutils          |             []                                    |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  6
+     minicom            |                    []                             | 14
+     mysecretdiary      |          []        []                             | 12
+     nano               |                    []                     []      | 17
+     nano_1_0           |          [] []     []                             | 18
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 10
+     pilot-qof          |                    []                             |  3
+     psmisc             |                    []                             | 10
+     pwdutils           |                    []                             |  3
+     python             |                                                   |  0
+     qof                |                    []                             |  4
+     radius             |             []                                    |  6
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                     []      | 14
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []                     []      | 22
+     sh-utils           |          []                                       | 15
+     shared-mime-info   |             []     []         []          []      | 24
+     sharutils          |          []        []                     []      | 23
+     shishi             |                                                   |  1
+     silky              |                    []                             |  4
+     skencil            |                    []                             |  7
+     sketch             |                                                   |  6
+     solfege            |                                                   |  2
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     stardict           |             []     []         []          []      | 11
+     system-tools-ba... |    []    [] []     []     []  []          []      | 37
+     tar                |          [] []     []                     []      | 20
+     texinfo            |          []        []         []                  | 15
+     textutils          |          []                   []          []      | 17
+     tin                |                                                   |  1
+     tp-robot           |                    []         []          []      | 10
+     tuxpaint           |                    []  []                 []      | 16
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             | 11
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 22
+     wget               |          []        []                     []      | 19
+     xchat              |             []     []         []          []      | 29
+     xkeyboard-config   |          [] []     []                     []      | 11
+     xpad               |                    []         []          []      | 14
+                        +---------------------------------------------------+
+       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  2028
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -409,15 +1075,15 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If August 2002 seems to be old, you may fetch a more recent copy of
+   If October 2006 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
 
-Using `gettext' in new packages
-===============================
+1.6 Using `gettext' in new packages
+===================================
 
-   If you are writing a freely available program and want to
+If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 package.  Of course you have to respect the GNU Library General Public
 License which covers the use of the GNU `gettext' library.  This means
@@ -426,7 +1092,7 @@ library, whereas only free software can use `libintl' as a static
 library or use modified versions of `libintl'.
 
    Once the sources are changed appropriately and the setup can handle
-to use of `gettext' the only thing missing are the translations.  The
+the use of `gettext' the only thing missing are the translations.  The
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
diff --git a/ChangeLog b/ChangeLog
index 03f8016..c06f4c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3756 @@
 ===============================================================================
+Name: gutenprint-5_2_1
+
+2008-10-19	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.53) (+2747 -2447)
+		po/da.po (1.94) (+2745 -2448)
+		po/de.po (1.67) (+2738 -2447)
+		po/el.po (1.68) (+2747 -2447)
+		po/en_GB.po (1.161) (+2749 -2447)
+		po/es.po (1.66) (+2747 -2447)
+		po/fr.po (1.94) (+2749 -2447)
+		po/hu.po (1.25) (+2749 -2447)
+		po/ja.po (1.62) (+2747 -2447)
+		po/nb.po (1.27) (+2749 -2447)
+		po/nl.po (1.77) (+2745 -2448)
+		po/pl.po (1.72) (+2747 -2447)
+		po/pt.po (1.67) (+2747 -2447)
+		po/sk.po (1.71) (+2747 -2447)
+		po/sv.po (1.97) (+2750 -2448)
+		po/zh_TW.po (1.27) (+2747 -2447)
+
+	Gutenprint 5.2.1 release
+
+2008-10-19	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.398) (+1 -1)
+		configure.ac (1.205) (+4 -4)
+
+	Fix release that didn't get bumped.
+
+2008-10-19	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.397) (+2 -2)
+		README (1.196) (+15 -15)
+		configure.ac (1.204) (+4 -4)
+
+	Prep for 5.2.1 release
+
+2008-10-19	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.93) (+1209 -1122)
+		po/nl.po (1.76) (+1243 -1137)
+
+	Update Danish, Dutch translation
+
+2008-10-19	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.396) (+141 -19)
+		doc/gutenprint-users-manual.odt (1.5) (+356 -472)
+		doc/gutenprint-users-manual.pdf (1.5) (+3820 -2943)
+		src/foomatic/foomatic-generator.in (1.66) (+5 -4)
+		src/foomatic/foomatic-printermap (1.179) (+49 -0)
+		src/foomatic/printers.c (1.13) (+3 -1)
+		src/xml/escp2/inks/Makefile.am (1.5) (+4 -1)
+		src/xml/escp2/inks/nx100.xml (1.1) (added)
+		src/xml/escp2/inks/wf40.xml (1.1) (added)
+		src/xml/escp2/inks/wf500.xml (1.1) (added)
+		src/xml/escp2/media/Makefile.am (1.8) (+2 -1)
+		src/xml/escp2/media/c120.xml (1.12) (+48 -0)
+		src/xml/escp2/media/wf500.xml (1.1) (added)
+		src/xml/escp2/model/Makefile.am (1.9) (+4 -2)
+		src/xml/escp2/model/model_92.xml (1.2) (+108 -44)
+		src/xml/escp2/model/model_93.xml (1.1) (added)
+		src/xml/escp2/model/model_94.xml (1.1) (added)
+		src/xml/escp2/qualitypresets/Makefile.am (1.2) (+3 -2)
+		src/xml/escp2/qualitypresets/wf40.xml (1.1) (added)
+		src/xml/printers.xml (1.19) (+51 -1)
+		test/run-weavetest (1.27) (+3 -3)
+
+	   1) Preliminary support for the following printers.  These printers
+	      may be retuned for improved quality or performance in future
+	      releases.
+
+	      Epson inkjet printers:
+
+		Epson PictureMate 215
+		Epson PX 101
+		Epson PX 201
+		Epson PX 601F
+		Epson Stylus CX9300F
+		Epson Stylus CX9400F
+		Epson Stylus CX9475F
+		Epson Stylus DX9400F
+		Epson Stylus NX200
+		Epson Stylus NX400
+		Epson Stylus Photo R290
+		Epson Stylus Photo RX610
+		Epson Stylus Photo RX690
+		Epson Stylus Office B30
+		Epson Stylus Office B33
+		Epson Stylus Office B40W
+		Epson Stylus Office T30
+		Epson Stylus Office T33
+		Epson Stylus Office T40W
+		Epson Stylus Office BX300F
+		Epson Stylus Office BX600FW
+		Epson Stylus Office SX600FW
+		Epson Stylus Office TX300F
+		Epson Stylus Office TX600FW
+		Epson Stylus SX200
+		Epson Stylus SX205
+		Epson Stylus SX400
+		Epson Stylus SX405
+		Epson Stylus TX200
+		Epson Stylus TX400
+		Epson ME Office 70
+		Epson ME Office 80W
+		Epson ME Office 700FW
+		Epson WorkForce 30
+		Epson WorkForce 40
+		Epson WorkForce 500
+		Epson WorkForce 600
+
+	   2) Experimental support for the following printers.  These printers
+	      may not function correctly, and may be retuned for improved
+	      quality or performance in future releases.
+
+	      Epson inkjet printers:
+
+		Epson Artisan 700
+		Epson Artisan 800
+		Epson Stylus NX100
+		Epson Stylus NX300
+		Epson Stylus PX700FW
+		Epson Stylus PX800FW
+		Epson Stylus S20
+		Epson Stylus SX100
+		Epson Stylus SX105
+		Epson Stylus T20
+		Epson Stylus TX100
+		Epson Stylus Photo TX700W
+		Epson Stylus Photo TX800W
+
+2008-10-12	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.92) (+81 -183)
+		po/nl.po (1.75) (+98 -237)
+
+	Update Dutch and Danish translations
+
+2008-10-11	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.178) (+1 -0)
+		src/xml/printers.xml (1.18) (+2 -1)
+
+	Add Epson DX9400F
+
+2008-10-06	<rlk@sourceforge.net>
+
+	Files:	Makefile.am (1.154) (+13 -1)
+
+	Install ChangeLog, NEWS, AUTHORS, COPYING, and README into
+	documentation.
+
+===============================================================================
+Name: gutenprint-5_2_0-rc1
+
+2008-10-05	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.395) (+0 -4)
+
+	CUPS progress messages on OS X do not appear to be fully fixed.
+
+2008-10-04	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.52) (+1 -1)
+		po/da.po (1.91) (+1 -1)
+		po/de.po (1.66) (+1 -1)
+		po/el.po (1.67) (+1 -1)
+		po/en_GB.po (1.160) (+1 -1)
+		po/es.po (1.65) (+1 -1)
+		po/fr.po (1.93) (+1 -1)
+		po/hu.po (1.24) (+1 -1)
+		po/ja.po (1.61) (+1 -1)
+		po/nb.po (1.26) (+1 -1)
+		po/nl.po (1.74) (+1 -1)
+		po/pl.po (1.71) (+1 -1)
+		po/pt.po (1.66) (+1 -1)
+		po/sk.po (1.70) (+1 -1)
+		po/sv.po (1.96) (+2 -2)
+		po/zh_TW.po (1.26) (+1 -1)
+
+	Gutenprint 5.2.0-rc1 release
+
+2008-10-04	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.136) (+7 -5)
+
+	ATTR messages shouldn't be printed when suppress_messages is in
+	effect.
+
+2008-10-03	<easysw@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.135) (+5 -5)
+
+	Sigh...  Need to pass message catalog to stp_i18n_printf(), and between the
+	compiler not erroring out and the verbosity of the build I did not see the
+	warning...
+
+2008-10-03	<easysw@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.134) (+6 -6)
+
+	Use stp_i18n_printf() for INFO: messages, otherwise they won't be localized.
+
+2008-10-03	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.394) (+5 -1)
+
+	Force stderr to be unbuffered to ensure status messages get reported
+	on OS X.
+
+2008-10-03	<easysw@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.133) (+9 -2)
+
+	Don't buffer stderr so we get progress updates.
+
+2008-09-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/Makefile.am (1.8) (+3 -2)
+
+	Don't remove model_92 from the distribution even though it's currently
+	not used; it will cause confusion at a later date.
+
+2008-09-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.393) (+24 -2)
+		src/xml/escp2/model/Makefile.am (1.7) (+2 -3)
+		src/xml/printers.xml (1.17) (+4 -4)
+
+	Fix colors at 720 DPI and below on more Epson printers
+
+2008-09-28	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_65.xml (1.12) (+4 -12)
+
+	Redo fix 2034454 Epson DX7400 colours wrong below 1440dpi
+
+2008-09-25	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.170) (+365 -466)
+
+	Revert to 5.2.0-beta4 version.
+
+2008-09-22	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.53) (+3 -1)
+
+	Function correctly if there is no driver_bin installed but one is
+	specified on the command line.
+
+2008-09-22	<easysw@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.118) (+4 -4)
+
+	Get po files from srcdir...
+
+2008-09-20	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.392) (+164 -10)
+		README (1.195) (+7 -0)
+		README.package (1.2) (+102 -23)
+
+	Release note updates
+
+2008-09-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.52) (+14 -4)
+
+	Preserve original language in *StpLocale when updating a PPD file, to
+	allow -loriginal to return to original language.
+
+2008-09-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.169) (+466 -365)
+
+	Accept driver syntax in genppd.
+
+2008-09-17	<mbroughtn@sourceforge.net>
+
+	Files:	man/cups-genppd.8.in (1.6) (+2 -2)
+
+	Correct example.  Model lists now show Epson rather than EPSON printers.
+
+2008-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.391) (+7 -0)
+		doc/gutenprint-users-manual.odt (1.4) (+495 -479)
+		doc/gutenprint-users-manual.pdf (1.4) (+2896 -2908)
+
+	Miscellaneous updates
+
+2008-09-13	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.390) (+1 -1)
+		doc/gutenprint-users-manual.odt (1.3) (+744 -1064)
+		doc/gutenprint-users-manual.pdf (1.3) (+3793 -4813)
+		src/foomatic/foomatic-generator.in (1.65) (+41 -24)
+		src/foomatic/printers.c (1.12) (+2 -1)
+
+	Update manual and release notes.
+
+2008-09-13	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.389) (+849 -1152)
+
+	Start prep for 5.2 release.
+
+2008-09-13	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.203) (+3 -3)
+
+	Bump version
+
+2008-09-09	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.16) (+3 -3)
+
+	Fix the DX8400/DX8450 in addition to the CX8400.
+
+2008-09-03	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_91.xml (1.7) (+1 -1)
+
+	Fix CD position for R1900.
+
+2008-08-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.132) (+12 -9)
+
+	More correct way of specifying page dimensions.
+
+2008-08-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.11) (+3 -1)
+
+	Add -o option to specify command line options.
+
+2008-08-20	<rlk@sourceforge.net>
+
+	Files:	src/main/channel.c (1.30) (+14 -8)
+
+	Only retrieve the cyan, magenta, and yellow balances once rather than
+	each time through the loop.
+
+2008-08-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.10) (+40 -7)
+
+	Add -m argument to generate MD5 checksums.
+
+	Add -O argument to generate output.
+
+	Add -n argument to optionally not create PPD files.
+
+2008-08-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.131) (+15 -3)
+
+	[ 2058858 ] HP 870 truncates legal page
+
+	Print Gutenprint error messages as errors rather than as debug2's.
+
+	Fix is to explicitly set the page height and width in addition to the
+	page size.  This is an undocumented API wart that we should fix at
+	some point.
+
+===============================================================================
+Name: gutenprint-5_2_0-beta4
+
+2008-08-18	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.51) (+2922 -2899)
+		po/da.po (1.90) (+3065 -2945)
+		po/de.po (1.65) (+2933 -2910)
+		po/el.po (1.66) (+2923 -2900)
+		po/en_GB.po (1.159) (+2914 -2878)
+		po/es.po (1.64) (+2922 -2899)
+		po/fr.po (1.92) (+2927 -2889)
+		po/hu.po (1.23) (+2927 -2889)
+		po/ja.po (1.60) (+2922 -2899)
+		po/nb.po (1.25) (+2924 -2900)
+		po/nl.po (1.73) (+3099 -2960)
+		po/pl.po (1.70) (+2923 -2900)
+		po/pt.po (1.65) (+2923 -2900)
+		po/sk.po (1.69) (+2922 -2899)
+		po/sv.po (1.95) (+2928 -2890)
+		po/zh_TW.po (1.25) (+2919 -2898)
+
+	Gutenprint 5.2.0-beta4 release
+
+2008-08-18	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.388) (+6 -0)
+		src/main/print-ps.c (1.101) (+58 -21)
+		src/main/xmlppd.c (1.3) (+17 -0)
+
+	[ 1973668 ] Print preview does not correctly handle absence of PPD
+
+2008-08-16	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.387) (+40 -39)
+		README (1.194) (+2 -2)
+		src/foomatic/foomatic-printermap (1.177) (+1 -0)
+		src/xml/printers.xml (1.15) (+2 -1)
+
+	Add Epson CX5500.
+
+	Drop support for OS X 10.2.
+
+2008-08-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/i18n.c (1.6) (+3 -3)
+
+	Fix minor typo.
+
+2008-08-16	<easysw@sourceforge.net>
+
+	Files:	src/cups/i18n.c (1.5) (+12 -8)
+
+	Clean up fuzzy translation check, since "fuzzy" doesn't have to be the
+	first flag on the comment line.  Still need to decide if this is the right
+	thing to do or change the msgmerge options to not add fuzzies in the first
+	place...
+
+2008-08-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/i18n.c (1.4) (+10 -4)
+
+	Don't translate fuzzy translations.
+
+2008-08-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.117) (+2 -2)
+
+	Fix syntax error.
+
+2008-08-16	<easysw@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.116) (+1 -4)
+
+	Drop old reference to cups_bundledir...
+
+2008-08-15	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.115) (+4 -4)
+
+	Distribute i18n.h.
+
+2008-08-14	<tillkamppeter@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.14) (+16 -16)
+
+	Replaced more "Okidata" by "Oki", to assure that also CUPS Raster PPDs use "Oki" as manufacturer name.
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.9) (+2 -0)
+
+	Build PPD files before running.
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.176) (+15 -15)
+
+	Change Okidata to Oki per Till.
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.114) (+19 -9)
+		src/cups/cups-genppdupdate.in (1.51) (+7 -2)
+
+	Correctly install PPD files when required
+
+2008-08-14	<easysw@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.168) (+6 -3)
+
+	Re-commit LanguageEncoding fix (Robert is just too fast for me... :)
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.89) (+4 -1)
+
+	Comment out duplicate paper size for Sony UPDP10.
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.167) (+4 -3)
+
+	Ensure that we don't accidentally get a duplicate resolution
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.202) (+3 -2)
+		src/cups/Makefile.am (1.113) (+4 -4)
+
+	Check correctly for libiconv
+
+2008-08-14	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/f360_ultrachrome_k3.xml (1.9) (+0 -63)
+
+	Remove duplicate definitions of Watercolor paper
+
+2008-08-13	<easysw@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.112) (+4 -4)
+		src/cups/genppd.c (1.166) (+22 -22)
+		src/cups/i18n.c (1.3) (+4 -10)
+
+	Fix localization issues.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.386) (+3 -3)
+
+	Update note about how translations are done.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	src/cups/i18n.c (1.2) (+10 -3)
+
+	Add strlcpy function implementation.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/Makefile.am (1.6) (+3 -2)
+
+	Add model 92 to the Makefile.
+
+2008-08-13	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.201) (+2 -24)
+		include/gutenprint/gutenprint-intl-internal.h (1.4) (+9 -24)
+		include/gutenprint/gutenprint-intl.h (1.5) (+13 -29)
+		m4/stp_cups.m4 (1.11) (+0 -8)
+		po/Makevars (1.4) (+0 -12)
+		src/cups/Makefile.am (1.111) (+28 -72)
+		src/cups/genppd.c (1.165) (+70 -180)
+		src/cups/i18n.c (1.1) (added)
+		src/cups/i18n.h (1.1) (added)
+		src/cups/po2strings.c (1.3) (removed)
+		src/cups/rastertoprinter.c (1.130) (+39 -44)
+		src/main/Makefile.am (1.103) (+1 -2)
+		src/main/intl.c (1.12) (removed)
+
+	Revamp PPD and CUPS raster driver localization code to use our own loader
+	and remove the old bits.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	README (1.193) (+6 -5)
+
+	Update configuration output block.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	README (1.192) (+88 -42)
+
+	Add some more info about CUPS driver.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	README (1.191) (+0 -5)
+
+	Remove reference to CUPS back ends
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	Makefile.am (1.153) (+2 -2)
+
+	Distribute README.package for packagers.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.385) (+3 -2)
+
+	Minor updates.
+
+2008-08-13	<rlk@sourceforge.net>
+
+	Files:	README (1.190) (+10 -23)
+
+	Remove most references to Gimp-Print 4.2.
+
+2008-08-12	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.384) (+32 -13)
+
+	Note recent quality improvements on Epson printers.
+
+2008-08-12	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_64.xml (1.11) (+2 -2)
+		src/xml/escp2/model/model_67.xml (1.10) (+2 -2)
+		src/xml/escp2/model/model_68.xml (1.10) (+2 -2)
+		src/xml/escp2/model/model_70.xml (1.11) (+1 -1)
+		src/xml/escp2/model/model_71.xml (1.10) (+1 -1)
+		src/xml/escp2/model/model_81.xml (1.11) (+1 -0)
+		src/xml/escp2/model/model_82.xml (1.12) (+1 -0)
+		src/xml/escp2/model/model_85.xml (1.11) (+1 -0)
+		src/xml/escp2/model/model_91.xml (1.6) (+1 -0)
+
+	Improve borderless printing, particularly at high resolutions
+
+2008-08-12	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.13) (+5 -5)
+
+	Place printers in a more reasonable order in the file.
+
+2008-08-10	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_91.xml (1.5) (+0 -1)
+
+	Fix borderless printing on R1900.
+
+2008-08-10	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_81.xml (1.10) (+0 -1)
+		src/xml/escp2/model/model_82.xml (1.11) (+0 -1)
+
+	Fix borderless printers on Claria printers
+
+2008-08-06	<rlk@sourceforge.net>
+
+	Files:	src/main/print-pcl.c (1.156) (+1 -7)
+
+	Remove duplicate Resolution entry.
+
+2008-08-06	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.229) (+29 -1)
+
+	added support for the Quality option (although it currently is unused)
+
+2008-08-06	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.175) (+1 -0)
+		src/xml/printers.xml (1.12) (+2 -1)
+
+	added MP160, it seems to be similar to the MP150 and MP170 printer
+
+2008-08-05	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.383) (+4 -0)
+		src/xml/escp2/model/model_65.xml (1.11) (+12 -4)
+		src/xml/escp2/model/model_92.xml (1.1) (added)
+		src/xml/printers.xml (1.11) (+4 -4)
+
+	2034454 Epson DX7400 colours wrong below 1440dpi
+
+2008-08-05	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_65.xml (1.10) (+4 -12)
+
+	2034454 Epson DX7400 colours wrong below 1440 dpi
+
+	(really below 720 DPI)
+
+2008-08-02	<rleigh@sourceforge.net>
+
+	Files:	test/xml-curve.c (1.7) (+2 -2)
+
+	[test] Fix debug code in xml-curve.c
+
+2008-08-01	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.72) (+115 -242)
+
+	Updated Dutch translation
+
+2008-08-01	<rleigh@sourceforge.net>
+
+	Files:	po/en_GB.po (1.158) (+891 -1626)
+
+	[po] Update British English translation.
+
+2008-07-31	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.50) (+2 -2)
+
+	Fix an unitialized string error.
+
+2008-07-31	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.164) (+23 -21)
+
+	Some corrections per Till.
+
+2008-07-31	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.163) (+70 -7)
+
+	Add support for OpenPrinting PPD extensions Quick Presets and Widget
+	Hinting.
+
+2008-07-30	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.200) (+15 -3)
+
+	Add uname -a output to configure output.
+
+2008-07-30	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.199) (+14 -14)
+
+	Move the OS X NLS stuff before the other CUPS  stuff.
+
+2008-07-30	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.110) (+2 -2)
+
+	Avoid race condition when building PPD files with make -j.
+
+2008-07-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.382) (+7 -0)
+		configure.ac (1.198) (+27 -9)
+		src/cups/Makefile.am (1.109) (+8 -1)
+
+	Set --enable-translated-cups-ppds to a reasonable default based on USE_NLS.
+
+	Add --enable-globalized-cups-ppds option.
+
+2008-07-29	<rlk@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.27) (+20 -18)
+
+	Minor reorganization to place all requirements at the top.
+
+2008-07-28	<rlk@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.26) (+8 -7)
+
+	Add a few more required packages.
+
+2008-07-28	<rlk@sourceforge.net>
+
+	Files:	src/xml/papers.xml (1.5) (+13 -1)
+
+	Add comments alerting people not to stick margins on papers listed
+	here.
+
+2008-07-28	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-generator.in (1.64) (+3 -4)
+
+	Ensure that all printers get a meaningful setting for VeryHigh quality.
+
+2008-07-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.381) (+5 -6)
+
+	Minor wording fix.
+
+2008-07-28	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.89) (+89 -215)
+
+	Updated Danish translation
+
+2008-07-27	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.380) (+18 -13)
+
+	Additional minor updates
+
+2008-07-27	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.379) (+74 -30)
+
+	Various updates in preparation for 5.2.0-beta4.
+
+2008-07-27	<rlk@sourceforge.net>
+
+	Files:	src/main/print-pcl.c (1.155) (+100 -46)
+
+	Add quality presets to PCL driver.
+
+2008-07-27	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.49) (+9 -5)
+		src/cups/genppd.c (1.162) (+6 -7)
+
+	Always honor -l option to cups-genppdupdate, even if Gutenprint 5.2 is
+	in use (provides an out in the case of broken applications).
+
+	Allow -lC.
+
+	Allow -loriginal to preserve original language of PPD files, again with
+	Gutenprint 5.2.
+
+2008-07-27	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.108) (+7 -7)
+		src/cups/cups-genppdupdate.in (1.48) (+2 -7)
+
+	CUPS 1.1 still needs discrete PPD files
+
+2008-07-27	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.107) (+24 -10)
+		src/cups/cups-genppdupdate.in (1.47) (+44 -13)
+		src/cups/genppd.c (1.161) (+51 -40)
+		src/cups/test-ppds (1.5) (+9 -1)
+
+	Create separate targets for global PPDs, discrete translated PPDs,
+	non-translated PPDs, and global PPDs with numbers "localized".  The
+	latter is for testing purposes, to work around bugs in cupstestppd.
+
+	Add -N option to genppd to optionally localize numbers, for testing
+	purposes.
+
+	Treat absence of any -L argument to genppd as an indication to create
+	globalized PPDs; -L C generates non-translated PPD files.
+
+	Add -l option to cups-genppdupdate to specify the language for PPD
+	files.  For Gutenprint 5.2 and above, this is ignored as globalized
+	PPD files are corrected, so this is for downgrade purposes (at present).
+
+	Do not actually run test-ppds as part of automated testing, due to
+	problems with cupstestppd.
+
+	Add code to filter out spurious errors and warnings in test-ppds.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_87.xml (1.14) (+1 -1)
+
+	Use unidirectional by default at 720 HQ/1440x720 and better; it
+	generates noticeably smoother output.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.54) (+3 -2)
+
+	Fix nozzle start problem with split channel printers that in some
+	cases would reduce quality (introduced post-beta3, so no regression).
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.160) (+71 -19)
+
+	Translate group names.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.50) (+4669 -3781)
+		po/da.po (1.88) (+4382 -3397)
+		po/de.po (1.64) (+4243 -3357)
+		po/el.po (1.65) (+4213 -3326)
+		po/en_GB.po (1.157) (+4428 -3529)
+		po/es.po (1.63) (+5348 -4460)
+		po/fr.po (1.91) (+4429 -3529)
+		po/hu.po (1.22) (+4348 -3445)
+		po/ja.po (1.59) (+5337 -4449)
+		po/nb.po (1.24) (+4415 -3536)
+		po/nl.po (1.71) (+4414 -3410)
+		po/pl.po (1.69) (+4289 -3402)
+		po/pt.po (1.64) (+4913 -4025)
+		po/sk.po (1.68) (+5380 -4492)
+		po/sv.po (1.94) (+4193 -3306)
+		po/zh_TW.po (1.24) (+4248 -3364)
+
+	20080726 translation snapshot
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.129) (+8 -5)
+
+	Only set explicit width/height if named page size isn't present or is
+	invalid.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.378) (+4 -0)
+
+	Note fix of PictureMate PPD problem.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.377) (+26 -29)
+
+	No actual beta4 release yet.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.414) (+69 -4)
+
+	Select an appropriate paper size in stp_media_size().  Fixes custom
+	page sizes in PPD files for PictureMate printers.
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.8) (+20 -0)
+
+	Improve test performance by not unnecessarily running pdftops (which
+	is very slow on at least some systems).
+
+2008-07-26	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.159) (+9 -2)
+
+	Translators: please keep messages short.
+
+2008-07-25	<easysw@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.158) (+10 -2)
+
+	Don't localize numbers...
+
+2008-07-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.157) (+20 -3)
+		src/main/intl.c (1.11) (+16 -2)
+
+	Fix (hopefully for real) PPD globalization.
+
+2008-07-24	<easysw@sourceforge.net>
+
+	Files:	src/main/intl.c (1.10) (+7 -3)
+
+	Possible fix for 10.4.8 crash - don't localize if CFProcessPath isn't set.
+
+2008-07-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.106) (+2 -2)
+		src/cups/genppd.c (1.156) (+131 -149)
+		src/cups/rastertoprinter.c (1.128) (+5 -10)
+
+	Successfully translate prebuilt PPD files.
+
+	Correctly generate translations.
+
+2008-07-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.105) (+7 -2)
+		src/main/print-canon.c (1.228) (+5 -5)
+		src/main/print-escp2.c (1.413) (+19 -19)
+		src/main/print-lexmark.c (1.157) (+6 -6)
+		src/main/print-pcl.c (1.154) (+7 -7)
+		src/xml/escp2/inks/c64.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/c80.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/c82.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/claria.xml (1.5) (+8 -8)
+		src/xml/escp2/inks/cx3650.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/f360.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/f360_photo.xml (1.5) (+8 -8)
+		src/xml/escp2/inks/f360_photo7_japan.xml (1.5) (+20 -20)
+		src/xml/escp2/inks/f360_ultrachrome.xml (1.5) (+32 -32)
+		src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.6) (+42 -42)
+		src/xml/escp2/inks/photo_gen0.xml (1.5) (+12 -12)
+		src/xml/escp2/inks/photo_gen1.xml (1.5) (+12 -12)
+		src/xml/escp2/inks/photo_gen2.xml (1.5) (+12 -12)
+		src/xml/escp2/inks/photo_gen3.xml (1.5) (+12 -12)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/photo_gen4.xml (1.5) (+8 -8)
+		src/xml/escp2/inks/photo_pigment.xml (1.5) (+8 -8)
+		src/xml/escp2/inks/pro_gen1.xml (1.5) (+12 -12)
+		src/xml/escp2/inks/pro_gen2.xml (1.5) (+12 -12)
+		src/xml/escp2/inks/pro_pigment.xml (1.5) (+8 -8)
+		src/xml/escp2/inks/pro_ultrachrome.xml (1.5) (+32 -32)
+		src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.7) (+42 -42)
+		src/xml/escp2/inks/standard.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/standard_gen0.xml (1.5) (+4 -4)
+		src/xml/escp2/inks/ultrachrome.xml (1.5) (+32 -32)
+
+	Change "ChannelTransition" to "ChannelTrans" to reduce length of option
+	names and because these options have different meaning than in 5.0.
+
+	Take a cut at generating globalized PPD files correctly.
+
+2008-07-23	<easysw@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.155) (+179 -120)
+		src/cups/rastertoprinter.c (1.127) (+11 -6)
+
+	Map StpLightMagentaTransition to StpLtMagentaTransition to avoid getting
+	keywords longer than 40 characters.
+
+	Localize Resolution options and fix localization of numeric options.
+
+2008-07-22	<easysw@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.104) (+2 -2)
+		src/cups/genppd.c (1.154) (+4 -10)
+
+	Fix typos in genppd and uninstall changes.
+
+2008-07-21	<easysw@sourceforge.net>
+
+	Files:	po/Makevars (1.3) (+3 -0)
+		src/cups/Makefile.am (1.103) (+12 -35)
+		src/cups/genppd.c (1.153) (+68 -4)
+
+	Fix uninstall rules.
+
+	Add localizations of numeric and custom options.
+
+2008-07-21	<easysw@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.88) (+2 -2)
+
+	Fix invalid paper size text (colon can't be bare in UI text since genppd
+	doesn't do quoting of colons...)
+
+2008-07-21	<easysw@sourceforge.net>
+
+	Files:	po/.cvsignore (1.11) (+1 -0)
+		scripts/.cvsignore (1.5) (+1 -0)
+
+	Ignore other generated files.
+
+2008-07-21	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-ppds (1.4) (+4 -3)
+
+	Don't remove and make PPD files if command line argument is passed
+	(makes it easier to use manually).
+
+2008-07-21	<rlk@sourceforge.net>
+
+	Files:	src/main/print-vars.c (1.89) (+4 -4)
+
+	Fix potential null pointer dereference
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	src/main/intl.c (1.9) (+1 -7)
+
+	Remove bogus setbuf() call.
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	NEWS (1.376) (+17 -0)
+		src/cups/Info.plist.in (1.3) (+8 -0)
+		src/cups/Makefile.am (1.102) (+2 -2)
+		src/cups/genppd.c (1.152) (+6 -6)
+		src/cups/po2strings.c (1.2) (+148 -28)
+
+	Add information to NEWS file.
+
+	Add additional info to Info.plist file.
+
+	Use iconv to convert .po charset to UTF-8, then to UTF-16BE.
+
+	Fix cupsLanguages and language check to match.
+
+2008-07-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.101) (+4 -2)
+
+	Need to distribute po2strings.c
+
+2008-07-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.151) (+4 -4)
+
+	Avoid failure if language is not set.
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	src/cups/.cvsignore (1.12) (+1 -0)
+		src/cups/Info.plist.in (1.2) (+2 -2)
+
+	Fix typo...
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.197) (+3 -2)
+		src/cups/Info.plist (1.2) (removed)
+		src/cups/Info.plist.in (1.1) (added)
+		src/main/intl.c (1.8) (+9 -4)
+
+	Create Info.plist with proper Gutenprint version numbers.
+
+2008-07-20	<rlk@sourceforge.net>
+
+	Files:	src/main/print-pcl.c (1.153) (+9 -8)
+
+	Don't smash floating point default value when describing parameters.
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.150) (+316 -45)
+
+	Add support for generating globalized PPD files.
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	src/main/mxml-file.c (1.10) (+3 -3)
+
+	Fix potential NULL dereference.
+
+2008-07-20	<easysw@sourceforge.net>
+
+	Files:	src/main/intl.c (1.7) (+3 -1)
+
+	Fix compiler warning.
+
+2008-07-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.126) (+3 -2)
+
+	Need errno.h to use errno.
+
+2008-07-19	<easysw@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.125) (+103 -100)
+
+	Tweak CUPS raster driver messages based on feedback from Robert.
+
+2008-07-19	<easysw@sourceforge.net>
+
+	Files:	src/cups/.cvsignore (1.11) (+7 -6)
+		src/cups/rastertoprinter.c (1.124) (+165 -167)
+
+	Localize INFO, ERROR, and WARNING messages in CUPS raster driver, and make
+	several of them more user-friendly and without the "Gutenprint" prefix.
+
+	Update DEBUG messages to use a consistent "Gutenprint:" prefix.
+
+	Update .cvsignore file to account for current executable names.
+
+2008-07-19	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.375) (+6 -0)
+		src/xml/escp2/media/c120.xml (1.11) (+144 -0)
+		src/xml/escp2/model/model_85.xml (1.10) (+37 -4)
+
+	Add enhanced resolutions for C120 to reduce banding
+
+2008-07-19	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.374) (+3 -0)
+
+	Note CX8300/CX8400 fix.
+
+2008-07-19	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.10) (+3 -3)
+
+	Change CX8400 and CX8300 definitions to work correctly based on report.
+
+2008-07-19	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/b500.xml (1.12) (+61 -61)
+
+	Adjust B500 parameters per latest manual.
+
+2008-07-19	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_87.xml (1.13) (+1 -1)
+
+	Raise the limit for auto-bidirectional on B300.
+
+2008-07-19	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.196) (+3 -3)
+		include/gutenprint/gutenprint-intl-internal.h (1.3) (+6 -4)
+		include/gutenprint/gutenprint-intl.h (1.4) (+18 -18)
+		src/main/intl.c (1.6) (+10 -8)
+
+	Fix build system to support --disable-nls on Mac OS X.
+
+2008-07-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-raw.c (1.41) (+5 -1)
+
+	Call stp_image_init() correctly.
+
+2008-07-18	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.53) (+2 -2)
+
+	Fix crash with CMY mode, black and white, and low resolution.
+
+2008-07-18	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.373) (+5 -0)
+		src/main/escp2-driver.c (1.52) (+52 -38)
+		src/xml/escp2/media/b500.xml (1.11) (+68 -5)
+		src/xml/escp2/model/model_87.xml (1.12) (+35 -2)
+
+	Add HQ/enhanced resolutions to B-500 to match Epson OEM driver
+
+2008-07-18	<rlk@sourceforge.net>
+
+	Files:	test/run-weavetest (1.26) (+1 -1)
+
+	Add 358 nozzles for B500.
+
+2008-07-18	<rlk@sourceforge.net>
+
+	Files:	test/unprint.c (1.42) (+34 -23)
+
+	Separate split channel inks to enable inspection of each sub-channel.
+
+2008-07-17	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.24) (+11 -2)
+
+	Handle ESC(d command (appears to be nop).
+
+2008-07-17	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.412) (+15 -16)
+
+	Ensure that stp_image_init() and stp_image_conclude() are paired up.
+
+2008-07-17	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.31) (+1 -0)
+
+	Make sure to set error status if subprocess dies from a signal.
+
+2008-07-17	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.30) (+15 -13)
+
+	Weed out printers before running testpattern if -S mode is used (makes
+	valgrind a lot faster).
+
+	Exit if subprocess dies from signal in -S mode.
+
+2008-07-16	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpattern.c (1.54) (+47 -2)
+
+	Check to make sure stp_image_t calls are at least minimally valid.
+
+2008-07-16	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.87) (+14 -9)
+
+	Avoid overflow of nputc buffer.
+
+2008-07-16	<easysw@sourceforge.net>
+
+	Files:	src/main/intl.c (1.5) (+5 -3)
+
+	Fix crash when unable to get localized string.
+
+2008-07-16	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.29) (+31 -14)
+
+	Add -S option allowing running each printer through a separate
+	testpattern process.
+
+	Allow 2 -R options to run *only* the minimum resolution.
+
+2008-07-16	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.270) (+7 -7)
+
+	Fix fencepost causing double initialization/small memory leak
+
+2008-07-16	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.86) (+10 -7)
+
+	Ensure that image data is freed (avoid memory leak on Olympus P440).
+
+2008-07-16	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpattern.c (1.53) (+2 -2)
+
+	Correctly initialize global.
+
+2008-07-14	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.195) (+8 -2)
+
+	Add --with-archflags configure option to add compiler/linker flags after
+	all autoconf tests are done.
+
+2008-07-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.28) (+4 -4)
+
+	Use callgrind rather than cachegrind so kcachegrind works
+
+2008-07-14	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.269) (+33 -8)
+		src/main/print-weave.c (1.71) (+37 -23)
+
+	Improve weave setup performance by using qsort rather than bubble sort
+
+2008-07-13	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.85) (+19 -3)
+
+	Performance improvement for Olympus P200.
+
+2008-07-13	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/util.h (1.7) (+3 -2)
+		src/main/escp2-driver.c (1.51) (+7 -5)
+		src/main/print-escp2-data.c (1.268) (+1 -3)
+		src/main/print-escp2.c (1.411) (+13 -6)
+		src/main/print-papers.c (1.41) (+1 -26)
+		src/main/print-pcl.c (1.152) (+5 -8)
+		src/main/print-weave.c (1.70) (+48 -53)
+
+	Add debug option to turn off compression.
+
+	Remove some dead code.
+
+	Minor code cleanup.
+
+2008-07-13	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.149) (+2 -6)
+
+	Remove some dead code.
+
+2008-07-13	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.148) (+14 -7)
+
+	Need to limit X resolution also to avoid confusing MS Office.
+
+2008-07-12	<easysw@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.100) (+2 -2)
+
+	Don't fail due to missing locale dir.
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-vars.c (1.88) (+11 -1)
+
+	Fail if we try to fill a param string with no text or category.
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-vars.c (1.87) (+2 -2)
+
+	Don't attempt to translate a null help string.
+
+2008-07-12	<easysw@sourceforge.net>
+
+	Files:	src/main/intl.c (1.4) (+4 -1)
+
+	Protect against NULL translation text.
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.7) (+7 -3)
+
+	Add -V (verbose) option.
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/paper.h (1.4) (+3 -3)
+
+	Fix Doxygen comment
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.194) (+3 -3)
+
+	Fix up incorrect test.
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.410) (+48 -47)
+
+	Only display densities and hue maps for appropriate inks
+
+2008-07-12	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.372) (+23 -1)
+
+	Additional accumulated changes
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.46) (+20 -5)
+		src/cups/genppd.c (1.147) (+19 -19)
+
+	Avoid use of vertical resolutions greater than 720 DPI when listing
+	XXXxYYYdpi resolutions in PPD files, to cater to certain broken
+	applications.
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	src/main/intl.c (1.3) (+2 -2)
+
+	Add comment at #elif defined(ENABLE_NLS) for clarity.
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.193) (+10 -8)
+
+	Don't print out "bundle" message on non-OS X systems (where it's
+	meaningless).
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.192) (+5 -3)
+		src/cups/Makefile.am (1.99) (+7 -2)
+
+	Conditionalize special OS X CUPS install code.
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.409) (+13 -2)
+		src/main/print-escp2.h (1.132) (+3 -2)
+		src/xml/escp2/model/model_87.xml (1.11) (+1 -0)
+
+	Improve print quality at bottom of page on B-500 type printers.
+	Tested with both non-duplex (where it helps) and duplex (where it
+	must be disabled).
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.50) (+7 -6)
+
+	Don't send a unidirectional/bidirectional command if bidirectional
+	upper limit is set to -1.
+
+2008-07-11	<rlk@sourceforge.net>
+
+	Files:	src/main/print-weave.c (1.69) (+3 -3)
+
+	Print out a fe more debugging parameters.
+
+2008-07-09	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui2/panel.c (1.18) (+104 -20)
+
+	Offer integer options
+
+2008-07-09	<rlk@sourceforge.net>
+
+	Files:	src/main/print-color.c (1.140) (+2 -2)
+
+	Make color correction be a basic parameter.
+
+2008-07-08	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.191) (+4 -3)
+		src/main/print-util.c (1.116) (+2 -2)
+
+	Rename --with-nickname=foo to --with-cups-nickname=foo.
+
+	stp_set_codeset depended on gettext.
+
+2008-07-08	<rlk@sourceforge.net>
+
+	Files:	test/unprint.c (1.41) (+4 -1)
+
+	Handle additional inks on B-300.
+
+2008-07-08	<rlk@sourceforge.net>
+
+	Files:	src/main/intl.c (1.2) (+2 -1)
+
+	Use of strcmp requires string.h.
+
+2008-07-08	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.408) (+8 -5)
+
+	Allow use of quadtone inks with color mode; switch to black and white
+	dynamically.
+
+2008-07-08	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.190) (+20 -4)
+		include/gutenprint/gutenprint-intl-internal.h (1.2) (+15 -2)
+		include/gutenprint/gutenprint-intl.h (1.3) (+16 -2)
+		m4/stp_cups.m4 (1.10) (+8 -0)
+		po/Makevars (1.2) (+9 -0)
+		src/cups/Info.plist (1.1) (added)
+		src/cups/Makefile.am (1.98) (+57 -2)
+		src/cups/genppd.c (1.146) (+22 -106)
+		src/cups/po2strings.c (1.1) (added)
+		src/cups/rastertoprinter.c (1.123) (+3 -3)
+		src/main/Makefile.am (1.102) (+2 -1)
+		src/main/intl.c (1.1) (added)
+
+	configure.ac:
+	    - Filter out trailing "svn" from cups version numbers.
+	    - Use CoreFoundation for localization.
+	    - Add --with-nickname configure option to override default
+	      "CUPS+Gutenprint" suffix.
+
+	m4/stp_cups.m4:
+	    - Add cups_bundledir definition.
+
+	po/Makevars:
+	    - Add dummy Mac OS X po install targets.
+
+	src/cups/Info.plist:
+	    - Added (bundle information file)
+
+	src/cups/Makefile.am:
+	    - Add install targets so we can symlink into a bundle.
+	    - Add .strings install to install-data-local target.
+
+	src/cups/genppd.c:
+	    - Move bulk of set_language() to main/intl.c.
+	    - Drop default language suffix from URI, and do not enumerate all
+	      of the languages we support - we'll be doing globalized PPDs.
+	      (still support the suffix if provided by the user)
+	    - Update copyrights to this year and my name instead of ESP.
+	    - Use driver long name instead of Ghostscript for Product.
+	    - Only list one PSVersion.
+
+	src/cups/rastertoprinter.c:
+	    - Update copyright to this year and my name instead of ESP.
+
+	src/cups/po2strings.c:
+	    - Added to convert .po files to .strings.
+
+	src/main/Makefile.am:
+	    - Added intl.c to libgutenprint sources.
+
+	src/main/intl.c:
+	    - Added with stp_gettext and stp_setlocale functions.
+
+2008-07-07	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/b500.xml (1.4) (+21 -15)
+		src/xml/escp2/inks/c120.xml (1.4) (+9 -3)
+		src/xml/escp2/inks/c64.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/c80.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/c82.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/claria.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/cmy.xml (1.4) (+3 -0)
+		src/xml/escp2/inks/cx3650.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/f360.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/f360_photo.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/f360_photo7_japan.xml (1.4) (+18 -0)
+		src/xml/escp2/inks/f360_ultrachrome.xml (1.4) (+748 -733)
+		src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.5) (+18 -0)
+		src/xml/escp2/inks/photo_gen0.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/photo_gen1.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/photo_gen2.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/photo_gen3.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/photo_gen4.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/photo_pigment.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/picturemate_4.xml (1.4) (+3 -0)
+		src/xml/escp2/inks/pro_gen1.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/pro_gen2.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/pro_pigment.xml (1.4) (+12 -0)
+		src/xml/escp2/inks/pro_ultrachrome.xml (1.4) (+15 -0)
+		src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.6) (+18 -0)
+		src/xml/escp2/inks/standard.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/standard_gen0.xml (1.4) (+6 -0)
+		src/xml/escp2/inks/ultrachrome.xml (1.4) (+15 -0)
+		src/xml/escp2/inks/x80.xml (1.4) (+6 -0)
+		src/xml/escp2/media/b500.xml (1.10) (+113 -900)
+		src/xml/escp2/media/c120.xml (1.10) (+89 -612)
+		src/xml/escp2/media/c64.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/c80.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/c82.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/claria.xml (1.9) (+104 -792)
+		src/xml/escp2/media/claria1400.xml (1.7) (+104 -792)
+		src/xml/escp2/media/cmy.xml (1.7) (+91 -680)
+		src/xml/escp2/media/cx3650.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/f360.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/f360_photo.xml (1.7) (+128 -681)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.7) (+128 -681)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.7) (+211 -1475)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.8) (+220 -1517)
+		src/xml/escp2/media/photo_gen0.xml (1.7) (+148 -1364)
+		src/xml/escp2/media/photo_gen1.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/photo_gen2.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/photo_gen3.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/photo_gen3_4.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/photo_gen4.xml (1.8) (+92 -648)
+		src/xml/escp2/media/photo_pigment.xml (1.7) (+149 -782)
+		src/xml/escp2/media/picturemate_4.xml (1.7) (+42 -70)
+		src/xml/escp2/media/picturemate_6.xml (1.7) (+42 -70)
+		src/xml/escp2/media/pro_gen1.xml (1.7) (+153 -1368)
+		src/xml/escp2/media/pro_gen2.xml (1.7) (+154 -1369)
+		src/xml/escp2/media/pro_pigment.xml (1.7) (+159 -794)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.8) (+213 -1477)
+		src/xml/escp2/media/pro_ultrachrome_k3.xml (1.2) (+215 -1478)
+		src/xml/escp2/media/standard.xml (1.7) (+149 -1365)
+		src/xml/escp2/media/standard_gen0.xml (1.7) (+148 -1364)
+		src/xml/escp2/media/ultrachrome.xml (1.7) (+211 -1475)
+		src/xml/escp2/media/x80.xml (1.7) (+92 -681)
+
+	Use references to curves.
+
+2008-07-07	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.371) (+9 -6)
+
+	Update
+
+2008-07-07	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.45) (+3 -3)
+
+	Correctly split the locale from teh region.
+
+2008-07-07	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.27) (+1 -1)
+
+	Don't filter out "none" (default) value for options.
+
+2008-07-07	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.407) (+5 -2)
+
+	Try harder to find a usable ink type.
+
+2008-07-07	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.26) (+12 -5)
+
+	Add option to use minimum resolution where possible (for speed)
+
+2008-07-06	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.25) (+4 -4)
+
+	Don't smash the special option list.
+
+2008-07-06	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/cmykrb.xml (1.7) (+20 -20)
+		src/xml/escp2/inks/cmykro.xml (1.5) (+97 -269)
+		src/xml/escp2/inks/picturemate_6.xml (1.6) (+5 -5)
+		src/xml/escp2/media/cmykro.xml (1.4) (+202 -1448)
+		src/xml/escp2/media/r800.xml (1.2) (+188 -1434)
+		src/xml/escp2/model/model_91.xml (1.4) (+22 -15)
+
+	Preliminary tuning for R1900
+
+2008-07-06	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.86) (+5 -5)
+		src/main/print-vars.c (1.86) (+55 -26)
+		src/xml/escp2/inks/cmykrb.xml (1.6) (+73 -240)
+		src/xml/escp2/media/cmykrb.xml (1.8) (+198 -1444)
+
+	Allow driver data to refer to curves rather than embedding them
+
+2008-07-06	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.267) (+4 -2)
+
+	Match stp_xml_init with stp_xml_exit.
+
+2008-07-06	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.24) (+72 -24)
+
+	Allow cross product of options.
+
+2008-07-06	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/xml.h (1.4) (+8 -3)
+		src/main/escp2-channels.c (1.85) (+31 -12)
+		src/main/escp2-papers.c (1.117) (+6 -6)
+		src/main/escp2-resolutions.c (1.51) (+2 -2)
+		src/main/print-vars.c (1.85) (+77 -39)
+
+	Allow references to parameters rather than only inline values
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.116) (+7 -1)
+		src/main/print-escp2-data.c (1.266) (+6 -3)
+		src/xml/escp2/media/Makefile.am (1.7) (+2 -1)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.7) (+21 -41)
+		src/xml/escp2/media/pro_ultrachrome_k3.xml (1.1) (added)
+		src/xml/escp2/model/model_88.xml (1.6) (+1 -1)
+		src/xml/escp2/model/model_89.xml (1.5) (+1 -1)
+		src/xml/escp2/model/model_90.xml (1.5) (+1 -1)
+
+	Fix media definitions for x880 printers.
+
+	Change assert to printf/abort to print better information.
+
+	Check that media and ink specifications match (that check found the
+	problem with the x880).
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/cmykro.xml (1.4) (+3 -3)
+
+	Fix R1900 ink names.
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/cmykro.xml (1.3) (+45 -45)
+
+	R1900 apparently doesn't need head offset.
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/paper.h (1.3) (+24 -8)
+		src/cups/rastertoprinter.c (1.122) (+13 -6)
+		src/ghost/ijsgutenprint.c (1.21) (+2 -2)
+		src/main/print-papers.c (1.40) (+32 -2)
+		src/xml/escp2/inks/cmykrb.xml (1.5) (+260 -160)
+		src/xml/escp2/inks/cmykro.xml (1.2) (+260 -160)
+		src/xml/escp2/inks/picturemate_6.xml (1.5) (+65 -128)
+		src/xml/escp2/media/Makefile.am (1.6) (+2 -1)
+		src/xml/escp2/media/b500.xml (1.9) (+604 -308)
+		src/xml/escp2/media/c120.xml (1.9) (+408 -204)
+		src/xml/escp2/media/c64.xml (1.6) (+912 -456)
+		src/xml/escp2/media/c80.xml (1.6) (+912 -456)
+		src/xml/escp2/media/c82.xml (1.6) (+912 -456)
+		src/xml/escp2/media/claria.xml (1.8) (+528 -286)
+		src/xml/escp2/media/claria1400.xml (1.6) (+528 -286)
+		src/xml/escp2/media/cmy.xml (1.6) (+456 -228)
+		src/xml/escp2/media/cmykrb.xml (1.7) (+960 -440)
+		src/xml/escp2/media/cmykro.xml (1.3) (+960 -440)
+		src/xml/escp2/media/cx3650.xml (1.6) (+912 -456)
+		src/xml/escp2/media/f360.xml (1.6) (+912 -456)
+		src/xml/escp2/media/f360_photo.xml (1.6) (+456 -228)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.6) (+456 -228)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.6) (+984 -574)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.7) (+1008 -588)
+		src/xml/escp2/media/photo_gen0.xml (1.6) (+912 -456)
+		src/xml/escp2/media/photo_gen1.xml (1.6) (+912 -456)
+		src/xml/escp2/media/photo_gen2.xml (1.6) (+912 -456)
+		src/xml/escp2/media/photo_gen3.xml (1.6) (+912 -475)
+		src/xml/escp2/media/photo_gen3_4.xml (1.6) (+912 -475)
+		src/xml/escp2/media/photo_gen4.xml (1.7) (+432 -234)
+		src/xml/escp2/media/photo_pigment.xml (1.6) (+504 -294)
+		src/xml/escp2/media/picturemate_4.xml (1.6) (+48 -22)
+		src/xml/escp2/media/picturemate_6.xml (1.6) (+48 -22)
+		src/xml/escp2/media/pro_gen1.xml (1.6) (+912 -456)
+		src/xml/escp2/media/pro_gen2.xml (1.6) (+912 -456)
+		src/xml/escp2/media/pro_pigment.xml (1.6) (+504 -294)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.6) (+984 -574)
+		src/xml/escp2/media/r800.xml (1.1) (added)
+		src/xml/escp2/media/standard.xml (1.6) (+912 -456)
+		src/xml/escp2/media/standard_gen0.xml (1.6) (+912 -456)
+		src/xml/escp2/media/ultrachrome.xml (1.6) (+984 -574)
+		src/xml/escp2/media/x80.xml (1.6) (+456 -228)
+		src/xml/escp2/model/model_64.xml (1.10) (+1 -2)
+		test/unprint.c (1.40) (+20 -14)
+
+	R800 does not take new paper handling commands (R1800 apparently does).
+
+	Clean up formatting of curves in XML files.
+
+	Add function to find paper size precisely by size and make ijsgutenprint
+	use it.
+
+	CUPS driver handles explicit paper size that it can't find (e. g.
+	someone edited the PPD file) by treating it as a custom size.
+
+	Unprinter handles orange ink.
+
+	Remove incorrect hue curves on CMY/CMYK inks.
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.23) (+1 -1)
+
+	Fix off by one in printing remote commands.
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.96) (+20 -19)
+
+	Add orange ink for R1900.
+
+2008-07-05	<rlk@sourceforge.net>
+
+	Files:	Makefile.am (1.152) (+2 -2)
+		scripts/mkchlog (1.12) (+49 -25)
+
+	Generalize mkchlog and ignore certain directories
+
+2008-07-04	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/vars.h (1.7) (+3 -1)
+		src/escputil/d4lib.c (1.10) (+0 -1)
+		src/gimp2/print-gutenprint.c (1.2) (+3 -2)
+		src/gutenprintui2/plist.c (1.18) (+2 -3)
+		src/main/dither-main.c (1.61) (+3 -3)
+		src/main/escp2-driver.c (1.49) (+1 -5)
+		src/main/generic-options.c (1.11) (+6 -6)
+		src/main/print-canon.c (1.227) (+17 -17)
+		src/main/print-escp2.c (1.406) (+73 -73)
+		src/main/print-lexmark.c (1.156) (+10 -12)
+		src/main/print-olympus.c (1.84) (+9 -9)
+		src/main/print-pcl.c (1.151) (+11 -11)
+		src/main/print-ps.c (1.100) (+4 -4)
+		src/main/print-raw.c (1.40) (+3 -3)
+
+	Fix some Solaris compiler warnings
+
+2008-07-04	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.6) (+10 -4)
+
+	Handle the absence of pstoraster, which is not a standard part of
+	CUPS.
+
+	Don't assume /bin/sh
+
+	Fix a bash-ism.
+
+2008-07-04	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.189) (+2 -3)
+
+	Remove src/resolutions makefile
+
+2008-07-04	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.174) (+1 -0)
+		src/xml/escp2/media/cmykro.xml (1.2) (+223 -221)
+		src/xml/escp2/model/model_91.xml (1.3) (+2 -2)
+		src/xml/printers.xml (1.9) (+2 -1)
+
+	Change definitions to match R1900 manual.
+
+	Add PX-G5300 as alias for R1900.
+
+2008-07-04	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_87.xml (1.10) (+44 -44)
+
+	Rearrange to match layout of other files.
+
+2008-07-03	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-resolutions.c (1.50) (+204 -195)
+		src/main/print-escp2-data.c (1.265) (+13 -19)
+		src/main/print-escp2.h (1.131) (+5 -2)
+		src/xml/escp2/Makefile.am (1.7) (+1 -4)
+		src/xml/escp2/model/model_0.xml (1.8) (+68 -5)
+		src/xml/escp2/model/model_1.xml (1.8) (+87 -5)
+		src/xml/escp2/model/model_10.xml (1.9) (+85 -5)
+		src/xml/escp2/model/model_11.xml (1.9) (+85 -5)
+		src/xml/escp2/model/model_12.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_13.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_14.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_15.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_16.xml (1.9) (+88 -5)
+		src/xml/escp2/model/model_17.xml (1.9) (+88 -5)
+		src/xml/escp2/model/model_18.xml (1.9) (+85 -5)
+		src/xml/escp2/model/model_19.xml (1.9) (+88 -5)
+		src/xml/escp2/model/model_2.xml (1.8) (+87 -5)
+		src/xml/escp2/model/model_20.xml (1.9) (+96 -5)
+		src/xml/escp2/model/model_21.xml (1.9) (+78 -5)
+		src/xml/escp2/model/model_22.xml (1.9) (+88 -5)
+		src/xml/escp2/model/model_23.xml (1.9) (+88 -5)
+		src/xml/escp2/model/model_24.xml (1.8) (+84 -5)
+		src/xml/escp2/model/model_25.xml (1.9) (+96 -5)
+		src/xml/escp2/model/model_26.xml (1.9) (+80 -5)
+		src/xml/escp2/model/model_27.xml (1.8) (+72 -5)
+		src/xml/escp2/model/model_28.xml (1.8) (+70 -6)
+		src/xml/escp2/model/model_29.xml (1.8) (+70 -6)
+		src/xml/escp2/model/model_3.xml (1.8) (+93 -5)
+		src/xml/escp2/model/model_30.xml (1.8) (+70 -6)
+		src/xml/escp2/model/model_31.xml (1.8) (+70 -6)
+		src/xml/escp2/model/model_32.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_33.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_34.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_35.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_36.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_37.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_38.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_39.xml (1.8) (+68 -5)
+		src/xml/escp2/model/model_4.xml (1.8) (+84 -5)
+		src/xml/escp2/model/model_40.xml (1.8) (+70 -6)
+		src/xml/escp2/model/model_41.xml (1.8) (+77 -6)
+		src/xml/escp2/model/model_42.xml (1.9) (+78 -5)
+		src/xml/escp2/model/model_43.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_44.xml (1.9) (+82 -5)
+		src/xml/escp2/model/model_45.xml (1.8) (+68 -5)
+		src/xml/escp2/model/model_46.xml (1.9) (+63 -5)
+		src/xml/escp2/model/model_47.xml (1.9) (+73 -5)
+		src/xml/escp2/model/model_48.xml (1.10) (+71 -6)
+		src/xml/escp2/model/model_49.xml (1.10) (+71 -6)
+		src/xml/escp2/model/model_5.xml (1.8) (+84 -5)
+		src/xml/escp2/model/model_50.xml (1.9) (+90 -5)
+		src/xml/escp2/model/model_51.xml (1.9) (+90 -5)
+		src/xml/escp2/model/model_52.xml (1.9) (+90 -5)
+		src/xml/escp2/model/model_53.xml (1.9) (+63 -5)
+		src/xml/escp2/model/model_54.xml (1.9) (+96 -5)
+		src/xml/escp2/model/model_55.xml (1.9) (+82 -5)
+		src/xml/escp2/model/model_56.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_57.xml (1.9) (+60 -5)
+		src/xml/escp2/model/model_58.xml (1.9) (+60 -5)
+		src/xml/escp2/model/model_59.xml (1.9) (+86 -5)
+		src/xml/escp2/model/model_6.xml (1.8) (+84 -5)
+		src/xml/escp2/model/model_60.xml (1.9) (+82 -5)
+		src/xml/escp2/model/model_61.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_62.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_63.xml (1.9) (+84 -5)
+		src/xml/escp2/model/model_64.xml (1.9) (+100 -6)
+		src/xml/escp2/model/model_65.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_66.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_67.xml (1.9) (+100 -6)
+		src/xml/escp2/model/model_68.xml (1.9) (+99 -5)
+		src/xml/escp2/model/model_69.xml (1.9) (+90 -5)
+		src/xml/escp2/model/model_7.xml (1.8) (+93 -5)
+		src/xml/escp2/model/model_70.xml (1.10) (+100 -6)
+		src/xml/escp2/model/model_71.xml (1.9) (+97 -6)
+		src/xml/escp2/model/model_72.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_73.xml (1.9) (+55 -5)
+		src/xml/escp2/model/model_74.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_75.xml (1.9) (+81 -5)
+		src/xml/escp2/model/model_76.xml (1.10) (+82 -6)
+		src/xml/escp2/model/model_77.xml (1.9) (+84 -5)
+		src/xml/escp2/model/model_78.xml (1.9) (+94 -5)
+		src/xml/escp2/model/model_79.xml (1.9) (+82 -5)
+		src/xml/escp2/model/model_8.xml (1.8) (+93 -5)
+		src/xml/escp2/model/model_80.xml (1.9) (+90 -5)
+		src/xml/escp2/model/model_81.xml (1.9) (+114 -6)
+		src/xml/escp2/model/model_82.xml (1.10) (+134 -6)
+		src/xml/escp2/model/model_83.xml (1.9) (+92 -5)
+		src/xml/escp2/model/model_84.xml (1.9) (+84 -5)
+		src/xml/escp2/model/model_85.xml (1.9) (+99 -6)
+		src/xml/escp2/model/model_86.xml (1.9) (+55 -5)
+		src/xml/escp2/model/model_87.xml (1.9) (+92 -7)
+		src/xml/escp2/model/model_88.xml (1.5) (+71 -6)
+		src/xml/escp2/model/model_89.xml (1.4) (+71 -6)
+		src/xml/escp2/model/model_9.xml (1.8) (+85 -5)
+		src/xml/escp2/model/model_90.xml (1.4) (+71 -6)
+		src/xml/escp2/model/model_91.xml (1.2) (+100 -6)
+
+	Embed resolution data inside model files.
+
+	Change "href" to "src".
+
+2008-07-02	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.173) (+1 -0)
+		src/main/escp2-channels.c (1.84) (+3 -3)
+		src/main/print-escp2.c (1.405) (+21 -3)
+		src/main/print-escp2.h (1.130) (+3 -3)
+		src/xml/escp2/inks/Makefile.am (1.4) (+2 -1)
+		src/xml/escp2/inks/cmykrb.xml (1.4) (+4 -4)
+		src/xml/escp2/inks/cmykro.xml (1.1) (added)
+		src/xml/escp2/inks/picturemate_6.xml (1.4) (+1 -1)
+		src/xml/escp2/media/Makefile.am (1.5) (+2 -1)
+		src/xml/escp2/media/cmykro.xml (1.1) (added)
+		src/xml/escp2/model/Makefile.am (1.5) (+3 -2)
+		src/xml/escp2/model/model_91.xml (1.1) (added)
+		src/xml/printers.xml (1.8) (+2 -1)
+
+	Add nominal support for R1900 (CMYKRO and CMYRO not enabled yet)
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.370) (+45 -20)
+		README (1.189) (+12 -51)
+		README.package (1.1) (added)
+
+	Update documentation for next release
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/b500.xml (1.3) (+121 -165)
+		src/xml/escp2/inks/c120.xml (1.3) (+109 -149)
+		src/xml/escp2/inks/c64.xml (1.3) (+138 -144)
+		src/xml/escp2/inks/c80.xml (1.3) (+139 -144)
+		src/xml/escp2/inks/c82.xml (1.3) (+139 -144)
+		src/xml/escp2/inks/claria.xml (1.3) (+246 -255)
+		src/xml/escp2/inks/cmy.xml (1.3) (+25 -26)
+		src/xml/escp2/inks/cmykrb.xml (1.3) (+702 -832)
+		src/xml/escp2/inks/cx3650.xml (1.3) (+138 -144)
+		src/xml/escp2/inks/defaultblack.xml (1.2) (+12 -12)
+		src/xml/escp2/inks/f360.xml (1.3) (+139 -144)
+		src/xml/escp2/inks/f360_photo.xml (1.3) (+246 -255)
+		src/xml/escp2/inks/f360_photo7_japan.xml (1.3) (+374 -386)
+		src/xml/escp2/inks/f360_ultrachrome.xml (1.3) (+723 -750)
+		src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.4) (+543 -556)
+		src/xml/escp2/inks/photo_gen0.xml (1.3) (+279 -288)
+		src/xml/escp2/inks/photo_gen1.xml (1.3) (+279 -288)
+		src/xml/escp2/inks/photo_gen2.xml (1.3) (+268 -278)
+		src/xml/escp2/inks/photo_gen3.xml (1.3) (+279 -288)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.3) (+139 -144)
+		src/xml/escp2/inks/photo_gen4.xml (1.3) (+246 -255)
+		src/xml/escp2/inks/photo_pigment.xml (1.3) (+246 -255)
+		src/xml/escp2/inks/picturemate_4.xml (1.3) (+54 -104)
+		src/xml/escp2/inks/picturemate_6.xml (1.3) (+252 -256)
+		src/xml/escp2/inks/pro_gen1.xml (1.3) (+279 -288)
+		src/xml/escp2/inks/pro_gen2.xml (1.3) (+279 -288)
+		src/xml/escp2/inks/pro_pigment.xml (1.3) (+246 -255)
+		src/xml/escp2/inks/pro_ultrachrome.xml (1.3) (+729 -756)
+		src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.5) (+543 -556)
+		src/xml/escp2/inks/standard.xml (1.3) (+139 -144)
+		src/xml/escp2/inks/standard_gen0.xml (1.3) (+139 -144)
+		src/xml/escp2/inks/ultrachrome.xml (1.3) (+733 -760)
+		src/xml/escp2/inks/x80.xml (1.3) (+101 -106)
+		src/xml/escp2/inputslots/b500.xml (1.3) (+8 -8)
+		src/xml/escp2/inputslots/cd_cutter_roll_feed.xml (1.3) (+23 -23)
+		src/xml/escp2/inputslots/cd_roll_feed.xml (1.3) (+18 -18)
+		src/xml/escp2/inputslots/cutter_roll_feed.xml (1.3) (+14 -14)
+		src/xml/escp2/inputslots/pro_roll_feed.xml (1.3) (+7 -6)
+		src/xml/escp2/inputslots/r1800.xml (1.3) (+22 -22)
+		src/xml/escp2/inputslots/r2400.xml (1.3) (+17 -17)
+		src/xml/escp2/inputslots/rx700.xml (1.3) (+17 -17)
+		src/xml/escp2/inputslots/spro5000.xml (1.3) (+11 -11)
+		src/xml/escp2/inputslots/standard_roll_feed.xml (1.3) (+10 -10)
+		src/xml/escp2/media/b500.xml (1.8) (+1173 -1173)
+		src/xml/escp2/media/c120.xml (1.8) (+1157 -1157)
+		src/xml/escp2/media/c64.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/c80.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/c82.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/claria.xml (1.7) (+1592 -1592)
+		src/xml/escp2/media/claria1400.xml (1.5) (+1592 -1592)
+		src/xml/escp2/media/cmy.xml (1.5) (+703 -703)
+		src/xml/escp2/media/cmykrb.xml (1.6) (+2087 -2087)
+		src/xml/escp2/media/cx3650.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/f360.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/f360_photo.xml (1.5) (+722 -722)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.5) (+722 -722)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.5) (+1647 -1647)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.6) (+2301 -2301)
+		src/xml/escp2/media/photo_gen0.xml (1.5) (+1425 -1425)
+		src/xml/escp2/media/photo_gen1.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/photo_gen2.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/photo_gen3.xml (1.5) (+1463 -1463)
+		src/xml/escp2/media/photo_gen3_4.xml (1.5) (+1463 -1463)
+		src/xml/escp2/media/photo_gen4.xml (1.6) (+1245 -1245)
+		src/xml/escp2/media/photo_pigment.xml (1.5) (+840 -840)
+		src/xml/escp2/media/picturemate_4.xml (1.5) (+74 -74)
+		src/xml/escp2/media/picturemate_6.xml (1.5) (+74 -74)
+		src/xml/escp2/media/pro_gen1.xml (1.5) (+1463 -1463)
+		src/xml/escp2/media/pro_gen2.xml (1.5) (+1501 -1501)
+		src/xml/escp2/media/pro_pigment.xml (1.5) (+903 -903)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.5) (+1709 -1709)
+		src/xml/escp2/media/standard.xml (1.5) (+1444 -1444)
+		src/xml/escp2/media/standard_gen0.xml (1.5) (+1425 -1425)
+		src/xml/escp2/media/ultrachrome.xml (1.5) (+1647 -1647)
+		src/xml/escp2/media/x80.xml (1.5) (+722 -722)
+		src/xml/escp2/mediasizes/standard.xml (1.2) (+93 -93)
+		src/xml/escp2/model/model_0.xml (1.7) (+38 -38)
+		src/xml/escp2/model/model_1.xml (1.7) (+37 -37)
+		src/xml/escp2/model/model_10.xml (1.8) (+41 -41)
+		src/xml/escp2/model/model_11.xml (1.8) (+40 -40)
+		src/xml/escp2/model/model_12.xml (1.8) (+53 -53)
+		src/xml/escp2/model/model_13.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_14.xml (1.8) (+45 -45)
+		src/xml/escp2/model/model_15.xml (1.8) (+45 -45)
+		src/xml/escp2/model/model_16.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_17.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_18.xml (1.8) (+43 -43)
+		src/xml/escp2/model/model_19.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_2.xml (1.7) (+37 -37)
+		src/xml/escp2/model/model_20.xml (1.8) (+45 -45)
+		src/xml/escp2/model/model_21.xml (1.8) (+59 -59)
+		src/xml/escp2/model/model_22.xml (1.8) (+47 -47)
+		src/xml/escp2/model/model_23.xml (1.8) (+47 -47)
+		src/xml/escp2/model/model_24.xml (1.7) (+39 -39)
+		src/xml/escp2/model/model_25.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_26.xml (1.8) (+57 -57)
+		src/xml/escp2/model/model_27.xml (1.7) (+40 -40)
+		src/xml/escp2/model/model_28.xml (1.7) (+41 -41)
+		src/xml/escp2/model/model_29.xml (1.7) (+41 -41)
+		src/xml/escp2/model/model_3.xml (1.7) (+38 -38)
+		src/xml/escp2/model/model_30.xml (1.7) (+41 -41)
+		src/xml/escp2/model/model_31.xml (1.7) (+41 -41)
+		src/xml/escp2/model/model_32.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_33.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_34.xml (1.8) (+57 -57)
+		src/xml/escp2/model/model_35.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_36.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_37.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_38.xml (1.8) (+59 -59)
+		src/xml/escp2/model/model_39.xml (1.7) (+37 -37)
+		src/xml/escp2/model/model_4.xml (1.7) (+38 -38)
+		src/xml/escp2/model/model_40.xml (1.7) (+41 -41)
+		src/xml/escp2/model/model_41.xml (1.7) (+41 -41)
+		src/xml/escp2/model/model_42.xml (1.8) (+58 -58)
+		src/xml/escp2/model/model_43.xml (1.8) (+58 -58)
+		src/xml/escp2/model/model_44.xml (1.8) (+57 -57)
+		src/xml/escp2/model/model_45.xml (1.7) (+37 -37)
+		src/xml/escp2/model/model_46.xml (1.8) (+59 -59)
+		src/xml/escp2/model/model_47.xml (1.8) (+58 -58)
+		src/xml/escp2/model/model_48.xml (1.9) (+49 -49)
+		src/xml/escp2/model/model_49.xml (1.9) (+49 -49)
+		src/xml/escp2/model/model_5.xml (1.7) (+38 -38)
+		src/xml/escp2/model/model_50.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_51.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_52.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_53.xml (1.8) (+58 -58)
+		src/xml/escp2/model/model_54.xml (1.8) (+45 -45)
+		src/xml/escp2/model/model_55.xml (1.8) (+57 -57)
+		src/xml/escp2/model/model_56.xml (1.8) (+57 -57)
+		src/xml/escp2/model/model_57.xml (1.8) (+63 -63)
+		src/xml/escp2/model/model_58.xml (1.8) (+49 -49)
+		src/xml/escp2/model/model_59.xml (1.8) (+58 -58)
+		src/xml/escp2/model/model_6.xml (1.7) (+38 -38)
+		src/xml/escp2/model/model_60.xml (1.8) (+61 -61)
+		src/xml/escp2/model/model_61.xml (1.8) (+61 -61)
+		src/xml/escp2/model/model_62.xml (1.8) (+52 -52)
+		src/xml/escp2/model/model_63.xml (1.8) (+52 -52)
+		src/xml/escp2/model/model_64.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_65.xml (1.8) (+48 -48)
+		src/xml/escp2/model/model_66.xml (1.8) (+61 -61)
+		src/xml/escp2/model/model_67.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_68.xml (1.8) (+55 -55)
+		src/xml/escp2/model/model_69.xml (1.8) (+61 -61)
+		src/xml/escp2/model/model_7.xml (1.7) (+40 -40)
+		src/xml/escp2/model/model_70.xml (1.9) (+53 -53)
+		src/xml/escp2/model/model_71.xml (1.8) (+56 -56)
+		src/xml/escp2/model/model_72.xml (1.8) (+59 -59)
+		src/xml/escp2/model/model_73.xml (1.8) (+49 -49)
+		src/xml/escp2/model/model_74.xml (1.8) (+47 -47)
+		src/xml/escp2/model/model_75.xml (1.8) (+47 -47)
+		src/xml/escp2/model/model_76.xml (1.9) (+49 -49)
+		src/xml/escp2/model/model_77.xml (1.8) (+51 -51)
+		src/xml/escp2/model/model_78.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_79.xml (1.8) (+61 -61)
+		src/xml/escp2/model/model_8.xml (1.7) (+39 -39)
+		src/xml/escp2/model/model_80.xml (1.8) (+61 -61)
+		src/xml/escp2/model/model_81.xml (1.8) (+54 -54)
+		src/xml/escp2/model/model_82.xml (1.9) (+54 -54)
+		src/xml/escp2/model/model_83.xml (1.8) (+50 -50)
+		src/xml/escp2/model/model_84.xml (1.8) (+52 -52)
+		src/xml/escp2/model/model_85.xml (1.8) (+63 -63)
+		src/xml/escp2/model/model_86.xml (1.8) (+47 -47)
+		src/xml/escp2/model/model_87.xml (1.8) (+48 -48)
+		src/xml/escp2/model/model_88.xml (1.4) (+51 -51)
+		src/xml/escp2/model/model_89.xml (1.3) (+51 -51)
+		src/xml/escp2/model/model_9.xml (1.7) (+40 -40)
+		src/xml/escp2/model/model_90.xml (1.3) (+51 -51)
+		src/xml/escp2/qualitypresets/p1_5.xml (1.2) (+45 -45)
+		src/xml/escp2/qualitypresets/picturemate.xml (1.2) (+35 -35)
+		src/xml/escp2/qualitypresets/standard.xml (1.2) (+45 -45)
+		src/xml/escp2/qualitypresets/v2880.xml (1.2) (+46 -46)
+		src/xml/escp2/weaves/pro7000.xml (1.2) (+5 -5)
+		src/xml/escp2/weaves/pro7500.xml (1.2) (+6 -6)
+		src/xml/escp2/weaves/pro7600.xml (1.2) (+7 -7)
+		src/xml/escp2/weaves/standard.xml (1.2) (+2 -2)
+
+	Clean up indentation/formatting of all XML files.
+
+	Fix ink definitions for 4-color PictureMate printers.
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.3) (+2 -0)
+		src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.4) (+2 -0)
+
+	Dark inks do need transition parameters
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.23) (+1 -2)
+
+	Don't forcibly default color correction to raw.
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.22) (+49 -52)
+
+	Add option to place md5 output in a single file.
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_88.xml (1.3) (+4 -2)
+		src/xml/escp2/model/model_89.xml (1.2) (+4 -2)
+		src/xml/escp2/model/model_90.xml (1.2) (+4 -2)
+
+	x880 printers have 8 inks
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.3) (+1 -1)
+
+	Correct name of ink set.
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.2) (+2 -2)
+
+	Light light black is apparently 0x20, not 0x30, on these printers.
+
+2008-06-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/Makefile.am (1.3) (+2 -1)
+		src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.1) (added)
+		src/xml/escp2/model/Makefile.am (1.4) (+4 -2)
+		src/xml/escp2/model/model_88.xml (1.2) (+1 -1)
+		src/xml/escp2/model/model_89.xml (1.1) (added)
+		src/xml/escp2/model/model_90.xml (1.1) (added)
+		src/xml/printers.xml (1.7) (+3 -3)
+
+	7880, 9880, and 11880 are 8-color Ultrachrome K3 printers
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.115) (+17 -1)
+		src/main/print-escp2-data.c (1.264) (+9 -1)
+		src/main/print-papers.c (1.39) (+3 -3)
+		src/main/print-vars.c (1.84) (+9 -1)
+
+	Protect reading XML files against locale issues
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.121) (+39 -14)
+		src/cups/test-rastertogutenprint.in (1.5) (+71 -8)
+
+	Use the actual page size name as passed to CUPS rather than trying
+	to find a best fit, which doesn't always do what is intended.  If the
+	user specified a custom page size, that's what CUPS should honor.
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.172) (+6 -1)
+		src/xml/escp2/model/Makefile.am (1.3) (+3 -2)
+		src/xml/escp2/model/model_88.xml (1.1) (added)
+		src/xml/papers.xml (1.4) (+19 -1)
+		src/xml/printers.xml (1.6) (+6 -1)
+
+	Add Epson 11880; add definitions for 7800, 7880, 9800, 9880
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.263) (+2 -2)
+		src/main/print-escp2.c (1.404) (+7 -1)
+
+	Fix logic for enlarging capability database
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.21) (+7 -4)
+		src/testpattern/testpattern.c (1.52) (+15 -6)
+		src/testpattern/testpattern.h (1.19) (+2 -1)
+
+	Add -q option to suppress progress output
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/xml/papers.xml (1.3) (+34 -7)
+		src/xml/printers.xml (1.5) (+27 -7)
+
+	Add copyright notices and comments
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.83) (+390 -3106)
+		src/main/escp2-driver.c (1.48) (+2 -2)
+		src/main/print-escp2-data.c (1.262) (+24 -368)
+		src/main/print-escp2.c (1.403) (+111 -136)
+		src/main/print-escp2.h (1.129) (+23 -36)
+		src/xml/escp2/inks/Makefile.am (1.2) (+2 -1)
+		src/xml/escp2/inks/b500.xml (1.2) (+79 -70)
+		src/xml/escp2/inks/c120.xml (1.2) (+63 -54)
+		src/xml/escp2/inks/c64.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/c80.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/c82.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/claria.xml (1.2) (+103 -115)
+		src/xml/escp2/inks/cmy.xml (1.2) (+12 -6)
+		src/xml/escp2/inks/cmykrb.xml (1.2) (+217 -171)
+		src/xml/escp2/inks/cx3650.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/defaultblack.xml (1.1) (added)
+		src/xml/escp2/inks/f360.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/f360_photo.xml (1.2) (+102 -102)
+		src/xml/escp2/inks/f360_photo7_japan.xml (1.2) (+173 -179)
+		src/xml/escp2/inks/f360_ultrachrome.xml (1.2) (+318 -328)
+		src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.2) (+282 -294)
+		src/xml/escp2/inks/photo_gen0.xml (1.2) (+126 -115)
+		src/xml/escp2/inks/photo_gen1.xml (1.2) (+126 -115)
+		src/xml/escp2/inks/photo_gen2.xml (1.2) (+126 -115)
+		src/xml/escp2/inks/photo_gen3.xml (1.2) (+126 -115)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/photo_gen4.xml (1.2) (+102 -126)
+		src/xml/escp2/inks/photo_pigment.xml (1.2) (+102 -94)
+		src/xml/escp2/inks/picturemate_4.xml (1.2) (+28 -16)
+		src/xml/escp2/inks/picturemate_6.xml (1.2) (+64 -40)
+		src/xml/escp2/inks/pro_gen1.xml (1.2) (+126 -115)
+		src/xml/escp2/inks/pro_gen2.xml (1.2) (+126 -115)
+		src/xml/escp2/inks/pro_pigment.xml (1.2) (+102 -94)
+		src/xml/escp2/inks/pro_ultrachrome.xml (1.2) (+318 -300)
+		src/xml/escp2/inks/standard.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/standard_gen0.xml (1.2) (+60 -51)
+		src/xml/escp2/inks/ultrachrome.xml (1.2) (+318 -300)
+		src/xml/escp2/inks/x80.xml (1.2) (+36 -30)
+
+	Convert remaining (ink channel) data to XML
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.369) (+2 -2)
+
+	Bump version.
+
+2008-06-28	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.20) (+75 -37)
+
+	Add RawChannels to list of parameters being tested.
+
+	Add -r option to turn off testing all resolutions.
+
+2008-06-27	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.114) (+43 -34)
+		src/main/escp2-resolutions.c (1.49) (+19 -10)
+		src/main/print-escp2-data.c (1.261) (+72 -7)
+		src/main/print-escp2.c (1.402) (+48 -113)
+		src/main/print-escp2.h (1.128) (+8 -5)
+
+	Encapsulate model IDs differently
+
+2008-06-27	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.22) (+4 -4)
+
+	Correct handling of old-style printers.
+
+2008-06-27	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.171) (+1 -0)
+		src/xml/printers.xml (1.4) (+2 -1)
+
+	Support B-308
+
+2008-06-22	<rlk@sourceforge.net>
+
+	Files:	po/POTFILES.in (1.24) (+0 -1)
+
+	Remove escp2-inks.c
+
+2008-06-22	<rlk@sourceforge.net>
+
+	Files:	src/main/Makefile.am (1.101) (+1 -2)
+		src/main/escp2-driver.c (1.47) (+9 -9)
+		src/main/escp2-inks.c (1.65) (removed)
+		src/main/escp2-resolutions.c (1.48) (+114 -519)
+		src/main/print-escp2-data.c (1.260) (+91 -473)
+		src/main/print-escp2.c (1.401) (+179 -214)
+		src/main/print-escp2.h (1.127) (+69 -119)
+
+	Convert resolution data to XML.
+
+2008-06-21	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.188) (+4 -2)
+		src/main/print-escp2-data.c (1.259) (+1 -3)
+		src/xml/escp2/Makefile.am (1.6) (+7 -1)
+		src/xml/escp2/inks/.cvsignore (1.1) (added)
+		src/xml/escp2/inks/Makefile.am (1.1) (added)
+		src/xml/escp2/inks/b500.xml (1.1) (added)
+		src/xml/escp2/inks/c120.xml (1.1) (added)
+		src/xml/escp2/inks/c64.xml (1.1) (added)
+		src/xml/escp2/inks/c80.xml (1.1) (added)
+		src/xml/escp2/inks/c82.xml (1.1) (added)
+		src/xml/escp2/inks/claria.xml (1.1) (added)
+		src/xml/escp2/inks/cmy.xml (1.1) (added)
+		src/xml/escp2/inks/cmykrb.xml (1.1) (added)
+		src/xml/escp2/inks/cx3650.xml (1.1) (added)
+		src/xml/escp2/inks/f360.xml (1.1) (added)
+		src/xml/escp2/inks/f360_photo.xml (1.1) (added)
+		src/xml/escp2/inks/f360_photo7_japan.xml (1.1) (added)
+		src/xml/escp2/inks/f360_ultrachrome.xml (1.1) (added)
+		src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.1) (added)
+		src/xml/escp2/inks/photo_gen0.xml (1.1) (added)
+		src/xml/escp2/inks/photo_gen1.xml (1.1) (added)
+		src/xml/escp2/inks/photo_gen2.xml (1.1) (added)
+		src/xml/escp2/inks/photo_gen3.xml (1.1) (added)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.1) (added)
+		src/xml/escp2/inks/photo_gen4.xml (1.1) (added)
+		src/xml/escp2/inks/photo_pigment.xml (1.1) (added)
+		src/xml/escp2/inks/picturemate_4.xml (1.1) (added)
+		src/xml/escp2/inks/picturemate_6.xml (1.1) (added)
+		src/xml/escp2/inks/pro_gen1.xml (1.1) (added)
+		src/xml/escp2/inks/pro_gen2.xml (1.1) (added)
+		src/xml/escp2/inks/pro_pigment.xml (1.1) (added)
+		src/xml/escp2/inks/pro_ultrachrome.xml (1.1) (added)
+		src/xml/escp2/inks/standard.xml (1.1) (added)
+		src/xml/escp2/inks/standard_gen0.xml (1.1) (added)
+		src/xml/escp2/inks/ultrachrome.xml (1.1) (added)
+		src/xml/escp2/inks/x80.xml (1.1) (added)
+		src/xml/escp2/model/model_0.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_1.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_10.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_11.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_12.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_13.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_14.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_15.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_16.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_17.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_18.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_19.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_2.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_20.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_21.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_22.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_23.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_24.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_25.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_26.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_27.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_28.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_29.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_3.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_30.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_31.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_32.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_33.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_34.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_35.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_36.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_37.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_38.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_39.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_4.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_40.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_41.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_42.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_43.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_44.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_45.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_46.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_47.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_48.xml (1.8) (+2 -0)
+		src/xml/escp2/model/model_49.xml (1.8) (+2 -0)
+		src/xml/escp2/model/model_5.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_50.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_51.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_52.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_53.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_54.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_55.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_56.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_57.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_58.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_59.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_6.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_60.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_61.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_62.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_63.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_64.xml (1.7) (+3 -1)
+		src/xml/escp2/model/model_65.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_66.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_67.xml (1.7) (+3 -1)
+		src/xml/escp2/model/model_68.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_69.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_7.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_70.xml (1.8) (+3 -1)
+		src/xml/escp2/model/model_71.xml (1.7) (+3 -1)
+		src/xml/escp2/model/model_72.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_73.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_74.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_75.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_76.xml (1.8) (+3 -1)
+		src/xml/escp2/model/model_77.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_78.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_79.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_8.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_80.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_81.xml (1.7) (+3 -1)
+		src/xml/escp2/model/model_82.xml (1.8) (+4 -2)
+		src/xml/escp2/model/model_83.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_84.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_85.xml (1.7) (+3 -1)
+		src/xml/escp2/model/model_86.xml (1.7) (+2 -0)
+		src/xml/escp2/model/model_87.xml (1.7) (+3 -1)
+		src/xml/escp2/model/model_9.xml (1.6) (+2 -0)
+
+	Add data for resolutions and channel definitions.  More code needs
+	to be written.
+
+	Fix media definition for Stylus Photo 1400.
+
+2008-06-21	<rlk@sourceforge.net>
+
+	Files:	README (1.188) (+7 -5)
+		scripts/autogen.sh (1.35) (+17 -8)
+
+	A few fixes from Matt Broughton.
+
+2008-06-21	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_48.xml (1.7) (+8 -5)
+		src/xml/escp2/model/model_49.xml (1.7) (+8 -5)
+
+	Add borderless support to Stylus Pro 7600/9600
+
+2008-06-20	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.187) (+4 -2)
+		src/main/escp2-driver.c (1.46) (+8 -7)
+		src/main/escp2-resolutions.c (1.47) (+161 -166)
+		src/main/print-escp2-data.c (1.258) (+97 -96)
+		src/main/print-escp2.c (1.400) (+5 -7)
+		src/main/print-escp2.h (1.126) (+20 -22)
+		src/testpattern/run-testpattern-2.in (1.19) (+23 -8)
+		src/xml/escp2/Makefile.am (1.5) (+14 -5)
+		src/xml/escp2/model/model_0.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_1.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_10.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_11.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_12.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_13.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_14.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_15.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_16.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_17.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_18.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_19.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_2.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_20.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_21.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_22.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_23.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_24.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_25.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_26.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_27.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_28.xml (1.5) (+2 -0)
+		src/xml/escp2/model/model_29.xml (1.5) (+2 -0)
+		src/xml/escp2/model/model_3.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_30.xml (1.5) (+2 -0)
+		src/xml/escp2/model/model_31.xml (1.5) (+2 -0)
+		src/xml/escp2/model/model_32.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_33.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_34.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_35.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_36.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_37.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_38.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_39.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_4.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_40.xml (1.5) (+2 -0)
+		src/xml/escp2/model/model_41.xml (1.5) (+2 -0)
+		src/xml/escp2/model/model_42.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_43.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_44.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_45.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_46.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_47.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_48.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_49.xml (1.6) (+2 -0)
+		src/xml/escp2/model/model_5.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_50.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_51.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_52.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_53.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_54.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_55.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_56.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_57.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_58.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_59.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_6.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_60.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_61.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_62.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_63.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_64.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_65.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_66.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_67.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_68.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_69.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_7.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_70.xml (1.7) (+1 -0)
+		src/xml/escp2/model/model_71.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_72.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_73.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_74.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_75.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_76.xml (1.7) (+1 -0)
+		src/xml/escp2/model/model_77.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_78.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_79.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_8.xml (1.5) (+1 -0)
+		src/xml/escp2/model/model_80.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_81.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_82.xml (1.7) (+1 -0)
+		src/xml/escp2/model/model_83.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_84.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_85.xml (1.6) (+1 -0)
+		src/xml/escp2/model/model_86.xml (1.6) (+1 -0)
+		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)
+		src/xml/escp2/qualitypresets/Makefile.am (1.1) (added)
+		src/xml/escp2/qualitypresets/p1_5.xml (1.1) (added)
+		src/xml/escp2/qualitypresets/picturemate.xml (1.1) (added)
+		src/xml/escp2/qualitypresets/standard.xml (1.1) (added)
+		src/xml/escp2/qualitypresets/v2880.xml (1.1) (added)
+		src/xml/escp2/weaves/.cvsignore (1.1) (added)
+		src/xml/escp2/weaves/Makefile.am (1.1) (added)
+		src/xml/escp2/weaves/pro7000.xml (1.1) (added)
+		src/xml/escp2/weaves/pro7500.xml (1.1) (added)
+		src/xml/escp2/weaves/pro7600.xml (1.1) (added)
+		src/xml/escp2/weaves/standard.xml (1.1) (added)
+
+	Convert quality presets and printer weave settings to XML.
+
+2008-06-18	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.87) (+597 -987)
+
+	Update Danish translation
+
+2008-06-17	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.44) (+2 -1)
+
+	We do need to use Fcntl.
+
+2008-06-16	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.82) (+1 -216)
+		src/main/print-escp2-data.c (1.257) (+104 -89)
+		src/main/print-escp2.c (1.399) (+15 -102)
+		src/main/print-escp2.h (1.125) (+4 -11)
+		src/xml/escp2/model/model_0.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_1.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_10.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_11.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_12.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_13.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_14.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_15.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_16.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_17.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_18.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_19.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_2.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_20.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_21.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_22.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_23.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_24.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_25.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_26.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_27.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_28.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_29.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_3.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_30.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_31.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_32.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_33.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_34.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_35.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_36.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_37.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_38.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_39.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_4.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_40.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_41.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_42.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_43.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_44.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_45.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_46.xml (1.5) (+9 -0)
+		src/xml/escp2/model/model_47.xml (1.5) (+9 -0)
+		src/xml/escp2/model/model_48.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_49.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_5.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_50.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_51.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_52.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_53.xml (1.5) (+9 -0)
+		src/xml/escp2/model/model_54.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_55.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_56.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_57.xml (1.5) (+9 -0)
+		src/xml/escp2/model/model_58.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_59.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_6.xml (1.4) (+6 -0)
+		src/xml/escp2/model/model_60.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_61.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_62.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_63.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_64.xml (1.5) (+10 -0)
+		src/xml/escp2/model/model_65.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_66.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_67.xml (1.5) (+10 -0)
+		src/xml/escp2/model/model_68.xml (1.5) (+10 -0)
+		src/xml/escp2/model/model_69.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_7.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_70.xml (1.6) (+8 -0)
+		src/xml/escp2/model/model_71.xml (1.5) (+10 -0)
+		src/xml/escp2/model/model_72.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_73.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_74.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_75.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_76.xml (1.6) (+6 -0)
+		src/xml/escp2/model/model_77.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_78.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_79.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_8.xml (1.4) (+8 -0)
+		src/xml/escp2/model/model_80.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_81.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_82.xml (1.6) (+8 -0)
+		src/xml/escp2/model/model_83.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_84.xml (1.5) (+8 -0)
+		src/xml/escp2/model/model_85.xml (1.5) (+7 -0)
+		src/xml/escp2/model/model_86.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_87.xml (1.5) (+6 -0)
+		src/xml/escp2/model/model_9.xml (1.4) (+8 -0)
+
+	Convert channel names to XML
+
+2008-06-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.145) (+3 -3)
+
+	Remove safety check for output order, which is really implemented in
+	CUPS.
+
+2008-06-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.43) (+1 -4)
+
+	Remove unneeded 'use' statements.
+
+2008-06-15	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.21) (+200 -179)
+
+	Fix a few problems.
+
+	Improve performance.
+
+2008-06-15	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.256) (+338 -969)
+		src/main/print-escp2.c (1.398) (+2 -86)
+		src/main/print-escp2.h (1.124) (+19 -15)
+		src/xml/.cvsignore (1.2) (+3 -0)
+		src/xml/escp2/model/model_0.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_1.xml (1.3) (+26 -0)
+		src/xml/escp2/model/model_10.xml (1.4) (+29 -0)
+		src/xml/escp2/model/model_11.xml (1.4) (+28 -0)
+		src/xml/escp2/model/model_12.xml (1.4) (+41 -0)
+		src/xml/escp2/model/model_13.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_14.xml (1.4) (+29 -0)
+		src/xml/escp2/model/model_15.xml (1.4) (+29 -0)
+		src/xml/escp2/model/model_16.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_17.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_18.xml (1.4) (+29 -0)
+		src/xml/escp2/model/model_19.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_2.xml (1.3) (+26 -0)
+		src/xml/escp2/model/model_20.xml (1.4) (+29 -0)
+		src/xml/escp2/model/model_21.xml (1.4) (+45 -0)
+		src/xml/escp2/model/model_22.xml (1.4) (+31 -0)
+		src/xml/escp2/model/model_23.xml (1.4) (+31 -0)
+		src/xml/escp2/model/model_24.xml (1.3) (+28 -0)
+		src/xml/escp2/model/model_25.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_26.xml (1.4) (+41 -0)
+		src/xml/escp2/model/model_27.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_28.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_29.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_3.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_30.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_31.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_32.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_33.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_34.xml (1.4) (+43 -0)
+		src/xml/escp2/model/model_35.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_36.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_37.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_38.xml (1.4) (+45 -0)
+		src/xml/escp2/model/model_39.xml (1.3) (+26 -0)
+		src/xml/escp2/model/model_4.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_40.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_41.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_42.xml (1.4) (+44 -0)
+		src/xml/escp2/model/model_43.xml (1.4) (+44 -0)
+		src/xml/escp2/model/model_44.xml (1.4) (+43 -0)
+		src/xml/escp2/model/model_45.xml (1.3) (+26 -0)
+		src/xml/escp2/model/model_46.xml (1.4) (+41 -0)
+		src/xml/escp2/model/model_47.xml (1.4) (+41 -0)
+		src/xml/escp2/model/model_48.xml (1.4) (+30 -0)
+		src/xml/escp2/model/model_49.xml (1.4) (+30 -0)
+		src/xml/escp2/model/model_5.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_50.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_51.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_52.xml (1.4) (+42 -0)
+		src/xml/escp2/model/model_53.xml (1.4) (+40 -0)
+		src/xml/escp2/model/model_54.xml (1.4) (+29 -0)
+		src/xml/escp2/model/model_55.xml (1.4) (+43 -0)
+		src/xml/escp2/model/model_56.xml (1.4) (+43 -0)
+		src/xml/escp2/model/model_57.xml (1.4) (+45 -0)
+		src/xml/escp2/model/model_58.xml (1.4) (+32 -0)
+		src/xml/escp2/model/model_59.xml (1.4) (+44 -0)
+		src/xml/escp2/model/model_6.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_60.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_61.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_62.xml (1.4) (+35 -0)
+		src/xml/escp2/model/model_63.xml (1.4) (+35 -0)
+		src/xml/escp2/model/model_64.xml (1.4) (+36 -0)
+		src/xml/escp2/model/model_65.xml (1.4) (+34 -0)
+		src/xml/escp2/model/model_66.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_67.xml (1.4) (+36 -0)
+		src/xml/escp2/model/model_68.xml (1.4) (+36 -0)
+		src/xml/escp2/model/model_69.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_7.xml (1.3) (+27 -0)
+		src/xml/escp2/model/model_70.xml (1.5) (+35 -0)
+		src/xml/escp2/model/model_71.xml (1.4) (+36 -0)
+		src/xml/escp2/model/model_72.xml (1.4) (+45 -0)
+		src/xml/escp2/model/model_73.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_74.xml (1.4) (+32 -0)
+		src/xml/escp2/model/model_75.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_76.xml (1.5) (+33 -0)
+		src/xml/escp2/model/model_77.xml (1.4) (+34 -0)
+		src/xml/escp2/model/model_78.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_79.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_8.xml (1.3) (+26 -0)
+		src/xml/escp2/model/model_80.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_81.xml (1.4) (+36 -0)
+		src/xml/escp2/model/model_82.xml (1.5) (+36 -0)
+		src/xml/escp2/model/model_83.xml (1.4) (+35 -0)
+		src/xml/escp2/model/model_84.xml (1.4) (+35 -0)
+		src/xml/escp2/model/model_85.xml (1.4) (+46 -0)
+		src/xml/escp2/model/model_86.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_87.xml (1.4) (+33 -0)
+		src/xml/escp2/model/model_9.xml (1.3) (+27 -0)
+
+	Convert basic scalar data to XML
+
+2008-06-15	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.186) (+4 -4)
+
+	Bump version.
+
+2008-06-15	<rlk@sourceforge.net>
+
+	Files:	src/main/sequence.c (1.26) (+2 -2)
+
+	Avoid trivial infinite loop in certain cases of malformed sequence.
+
+2008-06-14	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.70) (+606 -1018)
+
+	Updated Dutch translation
+
+===============================================================================
+Name: gutenprint-5_2_0-beta3
+
+2008-06-14	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.49) (+6109 -3313)
+		po/da.po (1.86) (+6602 -3614)
+		po/de.po (1.63) (+7005 -4220)
+		po/el.po (1.64) (+5675 -2880)
+		po/en_GB.po (1.156) (+6602 -3617)
+		po/es.po (1.62) (+7028 -4230)
+		po/fr.po (1.90) (+6624 -3639)
+		po/hu.po (1.21) (+6645 -3607)
+		po/ja.po (1.58) (+7043 -4245)
+		po/nb.po (1.23) (+6506 -3708)
+		po/nl.po (1.69) (+6704 -3624)
+		po/pl.po (1.68) (+6471 -3678)
+		po/pt.po (1.63) (+6997 -4199)
+		po/sk.po (1.67) (+7355 -4557)
+		po/sv.po (1.93) (+6520 -3535)
+		po/zh_TW.po (1.23) (+7024 -4166)
+
+	Gutenprint 5.2.0-beta3 release
+
+2008-06-14	<rlk@sourceforge.net>
+
+	Files:	src/Makefile.am (1.22) (+2 -2)
+
+	Need to build src/main before src/xml to allow extract-strings to be built.
+
+2008-06-14	<rlk@sourceforge.net>
+
+	Files:	src/xml/extract-strings.c (1.2) (+2 -1)
+
+	Return correct exit status.
+
+2008-06-11	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.368) (+45 -4)
+		README (1.187) (+3 -3)
+		configure.ac (1.185) (+7 -7)
+
+	Prep for beta3 release
+
+2008-06-11	<rlk@sourceforge.net>
+
+	Files:	src/main/mxml-file.c (1.9) (+4 -3)
+
+	Fix trivial bug in stp_mxmlLoadFromFile.
+
+2008-06-11	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.45) (+40 -32)
+
+	Change ordering of remote commands to match Epson recommendations.
+
+2008-06-11	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/c120.xml (1.7) (+73 -73)
+
+	Further attempts to improve print speed/quality.
+
+2008-06-11	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/c120.xml (1.6) (+10 -10)
+
+	Improve print speed.
+
+2008-06-10	<rlk@sourceforge.net>
+
+	Files:	src/xml/Makefile.am (1.2) (+13 -11)
+		src/xml/escp2/Makefile.am (1.4) (+7 -2)
+		src/xml/escp2/inputslots/Makefile.am (1.2) (+4 -2)
+		src/xml/escp2/inputslots/b500.xml (1.2) (+2 -2)
+		src/xml/escp2/inputslots/cd_cutter_roll_feed.xml (1.2) (+5 -5)
+		src/xml/escp2/inputslots/cd_roll_feed.xml (1.2) (+4 -4)
+		src/xml/escp2/inputslots/cutter_roll_feed.xml (1.2) (+3 -3)
+		src/xml/escp2/inputslots/pro_roll_feed.xml (1.2) (+2 -2)
+		src/xml/escp2/inputslots/r1800.xml (1.2) (+5 -5)
+		src/xml/escp2/inputslots/r2400.xml (1.2) (+4 -4)
+		src/xml/escp2/inputslots/rx700.xml (1.2) (+4 -4)
+		src/xml/escp2/inputslots/spro5000.xml (1.2) (+4 -4)
+		src/xml/escp2/inputslots/standard_roll_feed.xml (1.2) (+2 -2)
+		src/xml/escp2/media/Makefile.am (1.4) (+4 -2)
+		src/xml/escp2/media/b500.xml (1.7) (+50 -50)
+		src/xml/escp2/media/c120.xml (1.5) (+34 -34)
+		src/xml/escp2/media/c64.xml (1.4) (+57 -57)
+		src/xml/escp2/media/c80.xml (1.4) (+57 -57)
+		src/xml/escp2/media/c82.xml (1.4) (+57 -57)
+		src/xml/escp2/media/claria.xml (1.6) (+44 -44)
+		src/xml/escp2/media/claria1400.xml (1.4) (+44 -44)
+		src/xml/escp2/media/cmy.xml (1.4) (+38 -38)
+		src/xml/escp2/media/cmykrb.xml (1.5) (+60 -60)
+		src/xml/escp2/media/cx3650.xml (1.4) (+57 -57)
+		src/xml/escp2/media/f360.xml (1.4) (+57 -57)
+		src/xml/escp2/media/f360_photo.xml (1.4) (+38 -38)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.4) (+38 -38)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.4) (+63 -63)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.5) (+66 -66)
+		src/xml/escp2/media/photo_gen0.xml (1.4) (+57 -57)
+		src/xml/escp2/media/photo_gen1.xml (1.4) (+57 -57)
+		src/xml/escp2/media/photo_gen2.xml (1.4) (+57 -57)
+		src/xml/escp2/media/photo_gen3.xml (1.4) (+57 -57)
+		src/xml/escp2/media/photo_gen3_4.xml (1.4) (+57 -57)
+		src/xml/escp2/media/photo_gen4.xml (1.5) (+36 -36)
+		src/xml/escp2/media/photo_pigment.xml (1.4) (+42 -42)
+		src/xml/escp2/media/picturemate_4.xml (1.4) (+4 -4)
+		src/xml/escp2/media/picturemate_6.xml (1.4) (+4 -4)
+		src/xml/escp2/media/pro_gen1.xml (1.4) (+57 -57)
+		src/xml/escp2/media/pro_gen2.xml (1.4) (+57 -57)
+		src/xml/escp2/media/pro_pigment.xml (1.4) (+42 -42)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.4) (+63 -63)
+		src/xml/escp2/media/standard.xml (1.4) (+57 -57)
+		src/xml/escp2/media/standard_gen0.xml (1.4) (+57 -57)
+		src/xml/escp2/media/ultrachrome.xml (1.4) (+63 -63)
+		src/xml/escp2/media/x80.xml (1.4) (+38 -38)
+		src/xml/escp2/mediasizes/Makefile.am (1.2) (+4 -2)
+		src/xml/escp2/model/Makefile.am (1.2) (+4 -2)
+		src/xml/extract-strings.c (1.1) (added)
+		src/xml/papers.xml (1.2) (+165 -165)
+		src/xml/printers.xml (1.3) (+1366 -1356)
+
+	Create xmli18n-tmp.h correctly
+
+2008-06-09	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.184) (+3 -2)
+		src/foomatic/foomatic-printermap (1.170) (+4 -1)
+		src/main/escp2-driver.c (1.44) (+12 -13)
+		src/main/escp2-papers.c (1.113) (+66 -1)
+		src/main/print-escp2-data.c (1.255) (+10 -10)
+		src/main/print-escp2.c (1.397) (+16 -7)
+		src/main/print-escp2.h (1.123) (+18 -11)
+		src/testpattern/run-testpattern-2.in (1.18) (+1 -1)
+		src/xml/escp2/Makefile.am (1.3) (+4 -3)
+		src/xml/escp2/mediasizes/.cvsignore (1.1) (added)
+		src/xml/escp2/mediasizes/Makefile.am (1.1) (added)
+		src/xml/escp2/mediasizes/standard.xml (1.1) (added)
+		src/xml/escp2/model/model_10.xml (1.3) (+1 -0)
+		src/xml/escp2/model/model_11.xml (1.3) (+1 -0)
+		src/xml/escp2/model/model_12.xml (1.3) (+1 -0)
+		src/xml/escp2/model/model_13.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_14.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_15.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_16.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_17.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_18.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_19.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_20.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_21.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_22.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_23.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_25.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_26.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_32.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_33.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_34.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_35.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_36.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_37.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_38.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_42.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_43.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_44.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_46.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_47.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_48.xml (1.3) (+1 -1)
+		src/xml/escp2/model/model_49.xml (1.3) (+1 -1)
+		src/xml/escp2/model/model_50.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_51.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_52.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_53.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_54.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_55.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_56.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_57.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_58.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_59.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_60.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_61.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_62.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_63.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_64.xml (1.3) (+3 -1)
+		src/xml/escp2/model/model_65.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_66.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_67.xml (1.3) (+3 -1)
+		src/xml/escp2/model/model_68.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_69.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_70.xml (1.4) (+4 -2)
+		src/xml/escp2/model/model_71.xml (1.3) (+4 -2)
+		src/xml/escp2/model/model_72.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_73.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_74.xml (1.3) (+3 -2)
+		src/xml/escp2/model/model_75.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_76.xml (1.4) (+4 -2)
+		src/xml/escp2/model/model_77.xml (1.3) (+3 -2)
+		src/xml/escp2/model/model_78.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_79.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_80.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_81.xml (1.3) (+4 -2)
+		src/xml/escp2/model/model_82.xml (1.4) (+4 -2)
+		src/xml/escp2/model/model_83.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_84.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_85.xml (1.3) (+4 -2)
+		src/xml/escp2/model/model_86.xml (1.3) (+2 -1)
+		src/xml/escp2/model/model_87.xml (1.3) (+3 -1)
+		src/xml/printers.xml (1.2) (+4 -1)
+
+	Add media size data.
+
+	Convert initialization sequences to XML.
+
+	Add some additional checks to run-testpattern-2.
+
+2008-06-08	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.254) (+177 -353)
+		src/main/print-escp2.c (1.396) (+37 -32)
+		src/main/print-escp2.h (1.122) (+7 -8)
+
+	Simplify loading
+
+2008-06-08	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.183) (+3 -2)
+		include/gutenprint/mxml.h (1.2) (+6 -2)
+		src/main/escp2-driver.c (1.43) (+8 -8)
+		src/main/escp2-papers.c (1.112) (+398 -453)
+		src/main/mxml-file.c (1.8) (+46 -2)
+		src/main/print-escp2-data.c (1.253) (+177 -328)
+		src/main/print-escp2.c (1.395) (+151 -414)
+		src/main/print-escp2.h (1.121) (+29 -20)
+		src/main/xml.c (1.42) (+8 -4)
+		src/xml/escp2/Makefile.am (1.2) (+3 -2)
+		src/xml/escp2/inputslots/.cvsignore (1.1) (added)
+		src/xml/escp2/inputslots/Makefile.am (1.1) (added)
+		src/xml/escp2/inputslots/b500.xml (1.1) (added)
+		src/xml/escp2/inputslots/cd_cutter_roll_feed.xml (1.1) (added)
+		src/xml/escp2/inputslots/cd_roll_feed.xml (1.1) (added)
+		src/xml/escp2/inputslots/cutter_roll_feed.xml (1.1) (added)
+		src/xml/escp2/inputslots/default.xml (1.1) (added)
+		src/xml/escp2/inputslots/pro_roll_feed.xml (1.1) (added)
+		src/xml/escp2/inputslots/r1800.xml (1.1) (added)
+		src/xml/escp2/inputslots/r2400.xml (1.1) (added)
+		src/xml/escp2/inputslots/rx700.xml (1.1) (added)
+		src/xml/escp2/inputslots/spro5000.xml (1.1) (added)
+		src/xml/escp2/inputslots/standard_roll_feed.xml (1.1) (added)
+		src/xml/escp2/media/b500.xml (1.6) (+2 -2)
+		src/xml/escp2/media/c120.xml (1.4) (+2 -2)
+		src/xml/escp2/media/c64.xml (1.3) (+2 -2)
+		src/xml/escp2/media/c80.xml (1.3) (+2 -2)
+		src/xml/escp2/media/c82.xml (1.3) (+2 -2)
+		src/xml/escp2/media/claria.xml (1.5) (+2 -2)
+		src/xml/escp2/media/claria1400.xml (1.3) (+2 -2)
+		src/xml/escp2/media/cmy.xml (1.3) (+2 -2)
+		src/xml/escp2/media/cmykrb.xml (1.4) (+2 -2)
+		src/xml/escp2/media/cx3650.xml (1.3) (+2 -2)
+		src/xml/escp2/media/f360.xml (1.3) (+2 -2)
+		src/xml/escp2/media/f360_photo.xml (1.3) (+2 -2)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.3) (+2 -2)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.3) (+2 -2)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.4) (+2 -2)
+		src/xml/escp2/media/photo_gen0.xml (1.3) (+2 -2)
+		src/xml/escp2/media/photo_gen1.xml (1.3) (+2 -2)
+		src/xml/escp2/media/photo_gen2.xml (1.3) (+2 -2)
+		src/xml/escp2/media/photo_gen3.xml (1.3) (+2 -2)
+		src/xml/escp2/media/photo_gen3_4.xml (1.3) (+2 -2)
+		src/xml/escp2/media/photo_gen4.xml (1.4) (+2 -2)
+		src/xml/escp2/media/photo_pigment.xml (1.3) (+2 -2)
+		src/xml/escp2/media/picturemate_4.xml (1.3) (+2 -2)
+		src/xml/escp2/media/picturemate_6.xml (1.3) (+2 -2)
+		src/xml/escp2/media/pro_gen1.xml (1.3) (+2 -2)
+		src/xml/escp2/media/pro_gen2.xml (1.3) (+2 -2)
+		src/xml/escp2/media/pro_pigment.xml (1.3) (+2 -2)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.3) (+2 -2)
+		src/xml/escp2/media/standard.xml (1.3) (+2 -2)
+		src/xml/escp2/media/standard_gen0.xml (1.3) (+2 -2)
+		src/xml/escp2/media/ultrachrome.xml (1.3) (+2 -2)
+		src/xml/escp2/media/x80.xml (1.3) (+2 -2)
+		src/xml/escp2/model/model_0.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_1.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_10.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_11.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_12.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_13.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_14.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_15.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_16.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_17.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_18.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_19.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_2.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_20.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_21.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_22.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_23.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_24.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_25.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_26.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_27.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_28.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_29.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_3.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_30.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_31.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_32.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_33.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_34.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_35.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_36.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_37.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_38.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_39.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_4.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_40.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_41.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_42.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_43.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_44.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_45.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_46.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_47.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_48.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_49.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_5.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_50.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_51.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_52.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_53.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_54.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_55.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_56.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_57.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_58.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_59.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_6.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_60.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_61.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_62.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_63.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_64.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_65.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_66.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_67.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_68.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_69.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_7.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_70.xml (1.3) (+7 -1)
+		src/xml/escp2/model/model_71.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_72.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_73.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_74.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_75.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_76.xml (1.3) (+7 -1)
+		src/xml/escp2/model/model_77.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_78.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_79.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_8.xml (1.2) (+4 -1)
+		src/xml/escp2/model/model_80.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_81.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_82.xml (1.3) (+7 -1)
+		src/xml/escp2/model/model_83.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_84.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_85.xml (1.2) (+7 -1)
+		src/xml/escp2/model/model_86.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_87.xml (1.2) (+6 -1)
+		src/xml/escp2/model/model_9.xml (1.2) (+4 -1)
+
+	Convert input slots to use XML.
+
+	Place top level tags in "escp2" namespace.
+
+	Convert init/deinit strings to XML.
+
+	Use href for referencing paper and input slot XML files.
+
+	Add mxml call to load from a named file (save having to open/close files
+	and all that).
+
+	Fix small memory leak in Epson driver on start/end job calls.
+
+2008-06-08	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.17) (+16 -6)
+		src/testpattern/testpattern.c (1.51) (+34 -12)
+		src/testpattern/testpattern.h (1.18) (+5 -2)
+		src/testpattern/testpatternl.l (1.22) (+3 -1)
+		src/testpattern/testpatterny.y (1.32) (+15 -2)
+
+	Correctly handle multi-page jobs
+
+2008-06-07	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/printer_options.c (1.5) (+9 -7)
+		src/testpattern/run-testpattern-2.in (1.16) (+33 -12)
+		src/testpattern/testpattern.c (1.50) (+13 -1)
+		src/testpattern/testpatternl.l (1.21) (+2 -1)
+		src/testpattern/testpatterny.y (1.31) (+12 -2)
+
+	Test full bleed.
+
+	Allow boolean parameters.
+
+	Set non-string parameters correctly in test pattern generator.
+
+2008-06-03	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/printers.h (1.5) (+12 -4)
+		src/main/printers.c (1.85) (+53 -18)
+		src/testpattern/run-testpattern-2.in (1.15) (+2 -1)
+		src/testpattern/testpattern.c (1.49) (+11 -1)
+
+	Add stp_set_printer_defaults_soft to allow setting defaults for only
+	unset parameters.
+
+	Test input slots, color correction algorithms, and image types.
+
+2008-06-03	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.81) (+9 -32)
+		src/main/print-escp2-data.c (1.252) (+3 -3)
+		src/main/print-escp2.c (1.394) (+134 -41)
+		src/xml/escp2/media/b500.xml (1.5) (+2 -0)
+		src/xml/escp2/media/c120.xml (1.3) (+692 -971)
+		src/xml/escp2/media/claria.xml (1.4) (+0 -36)
+		src/xml/escp2/media/claria1400.xml (1.2) (+0 -37)
+		src/xml/escp2/media/cmykrb.xml (1.3) (+649 -141)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.3) (+757 -121)
+		src/xml/escp2/media/photo_gen4.xml (1.3) (+567 -773)
+
+	Create definitions for C120, R800, R2400, and RX700.
+
+	Remove quadtone support for C120.
+
+	Fix some definitiosn for other printers.
+
+	Fix parameter definitions for dry times.
+
+	Extract all parameters from XML files (still needs to be tested!)
+
+2008-06-03	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.251) (+3 -3)
+
+	PM-D600 and PM-A650 should not use SN 01 command.
+
+2008-06-02	<rlk@sourceforge.net>
+
+	Files:	doc/gutenprint.dox.in (1.6) (+47 -10)
+		doc/gutenprintui2.dox.in (1.4) (+299 -83)
+
+	Update Doxygen input files to 1.5.3
+
+2008-06-02	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/vars.h (1.6) (+2 -2)
+
+	Fix documentation comment.
+
+2008-06-01	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/Makefile.am (1.3) (+2 -1)
+		src/xml/escp2/media/b500.xml (1.4) (+452 -0)
+		src/xml/escp2/media/claria.xml (1.3) (+925 -27)
+		src/xml/escp2/media/claria1400.xml (1.1) (added)
+		src/xml/escp2/model/model_82.xml (1.2) (+1 -1)
+
+	Add additional paper types for B500.
+
+	Add print method data for Claria printers.
+
+	Separate Stylus Photo 1400 (it has slightly different media handling).
+
+2008-06-01	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/b500.xml (1.3) (+48 -48)
+		src/xml/escp2/media/c120.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/c64.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/c80.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/c82.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/claria.xml (1.2) (+722 -722)
+		src/xml/escp2/media/cmy.xml (1.2) (+703 -703)
+		src/xml/escp2/media/cmykrb.xml (1.2) (+1533 -1533)
+		src/xml/escp2/media/cx3650.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/f360.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/f360_photo.xml (1.2) (+703 -703)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.2) (+703 -703)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.2) (+1627 -1627)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.2) (+1627 -1627)
+		src/xml/escp2/media/photo_gen0.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/photo_gen1.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/photo_gen2.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/photo_gen3.xml (1.2) (+1444 -1444)
+		src/xml/escp2/media/photo_gen3_4.xml (1.2) (+1444 -1444)
+		src/xml/escp2/media/photo_gen4.xml (1.2) (+1444 -1444)
+		src/xml/escp2/media/photo_pigment.xml (1.2) (+819 -819)
+		src/xml/escp2/media/picturemate_4.xml (1.2) (+72 -72)
+		src/xml/escp2/media/picturemate_6.xml (1.2) (+72 -72)
+		src/xml/escp2/media/pro_gen1.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/pro_gen2.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/pro_pigment.xml (1.2) (+819 -819)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.2) (+1629 -1629)
+		src/xml/escp2/media/standard.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/standard_gen0.xml (1.2) (+1425 -1425)
+		src/xml/escp2/media/ultrachrome.xml (1.2) (+1627 -1627)
+		src/xml/escp2/media/x80.xml (1.2) (+703 -703)
+
+	Fix names of HSL map parameters and clean up indentation
+
+2008-06-01	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.80) (+1 -32)
+		src/main/escp2-driver.c (1.42) (+22 -6)
+		src/main/print-escp2.c (1.393) (+5 -4)
+		src/main/xml.c (1.41) (+3 -3)
+		src/xml/escp2/media/Makefile.am (1.2) (+2 -1)
+		src/xml/escp2/media/b500.xml (1.2) (+790 -1469)
+		src/xml/escp2/media/photo_gen4.xml (1.1) (added)
+		src/xml/escp2/model/model_70.xml (1.2) (+1 -1)
+		src/xml/escp2/model/model_76.xml (1.2) (+1 -1)
+
+	Add support for MI and ESC(m commands for B500.
+
+	Remove quadtone ink support for B500.
+
+	Change stp_xmlstrtoul and stp_xmlstrtol to accept bases other than 10.
+
+	Support some additional media options in Epson driver.
+
+	Add additional media set for newer photo printers.
+
+2008-06-01	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.182) (+6 -2)
+		include/gutenprint/path.h (1.2) (+8 -2)
+		po/POTFILES.in (1.23) (+2 -2)
+		scripts/global.mk (1.11) (+1 -1)
+		src/Makefile.am (1.21) (+3 -2)
+		src/cups/Makefile.am (1.97) (+3 -3)
+		src/cups/genppd.c (1.144) (+45 -2)
+		src/cups/test-rastertogutenprint.in (1.4) (+1 -1)
+		src/foomatic/Makefile.am (1.51) (+3 -3)
+		src/main/.cvsignore (1.23) (+0 -1)
+		src/main/Makefile.am (1.100) (+2 -31)
+		src/main/dither-matrix-1x1.xml (1.3) (removed)
+		src/main/dither-matrix-2x1.xml (1.3) (removed)
+		src/main/dither-matrix-4x1.xml (1.3) (removed)
+		src/main/escp2-channels.c (1.79) (+79 -76)
+		src/main/escp2-driver.c (1.41) (+34 -32)
+		src/main/escp2-papers.c (1.111) (+1 -1681)
+		src/main/papers.xml (1.29) (removed)
+		src/main/path.c (1.20) (+24 -4)
+		src/main/print-escp2-data.c (1.250) (+110 -110)
+		src/main/print-escp2.c (1.392) (+532 -136)
+		src/main/print-escp2.h (1.120) (+25 -65)
+		src/main/print-vars.c (1.83) (+8 -4)
+		src/main/printers.xml (1.231) (removed)
+		src/main/xml.c (1.40) (+2 -12)
+		src/testpattern/run-testpattern (1.24) (+1 -1)
+		src/testpattern/run-testpattern-1 (1.10) (+1 -1)
+		src/testpattern/run-testpattern-2.in (1.14) (+4 -2)
+		src/xml/.cvsignore (1.1) (added)
+		src/xml/Makefile.am (1.1) (added)
+		src/xml/dither-matrix-1x1.xml (1.1) (added)
+		src/xml/dither-matrix-2x1.xml (1.1) (added)
+		src/xml/dither-matrix-4x1.xml (1.1) (added)
+		src/xml/escp2/.cvsignore (1.1) (added)
+		src/xml/escp2/Makefile.am (1.1) (added)
+		src/xml/escp2/media/.cvsignore (1.1) (added)
+		src/xml/escp2/media/Makefile.am (1.1) (added)
+		src/xml/escp2/media/b500.xml (1.1) (added)
+		src/xml/escp2/media/c120.xml (1.1) (added)
+		src/xml/escp2/media/c64.xml (1.1) (added)
+		src/xml/escp2/media/c80.xml (1.1) (added)
+		src/xml/escp2/media/c82.xml (1.1) (added)
+		src/xml/escp2/media/claria.xml (1.1) (added)
+		src/xml/escp2/media/cmy.xml (1.1) (added)
+		src/xml/escp2/media/cmykrb.xml (1.1) (added)
+		src/xml/escp2/media/cx3650.xml (1.1) (added)
+		src/xml/escp2/media/f360.xml (1.1) (added)
+		src/xml/escp2/media/f360_photo.xml (1.1) (added)
+		src/xml/escp2/media/f360_photo7_japan.xml (1.1) (added)
+		src/xml/escp2/media/f360_ultrachrome.xml (1.1) (added)
+		src/xml/escp2/media/f360_ultrachrome_k3.xml (1.1) (added)
+		src/xml/escp2/media/photo_gen0.xml (1.1) (added)
+		src/xml/escp2/media/photo_gen1.xml (1.1) (added)
+		src/xml/escp2/media/photo_gen2.xml (1.1) (added)
+		src/xml/escp2/media/photo_gen3.xml (1.1) (added)
+		src/xml/escp2/media/photo_gen3_4.xml (1.1) (added)
+		src/xml/escp2/media/photo_pigment.xml (1.1) (added)
+		src/xml/escp2/media/picturemate_4.xml (1.1) (added)
+		src/xml/escp2/media/picturemate_6.xml (1.1) (added)
+		src/xml/escp2/media/pro_gen1.xml (1.1) (added)
+		src/xml/escp2/media/pro_gen2.xml (1.1) (added)
+		src/xml/escp2/media/pro_pigment.xml (1.1) (added)
+		src/xml/escp2/media/pro_ultrachrome.xml (1.1) (added)
+		src/xml/escp2/media/standard.xml (1.1) (added)
+		src/xml/escp2/media/standard_gen0.xml (1.1) (added)
+		src/xml/escp2/media/ultrachrome.xml (1.1) (added)
+		src/xml/escp2/media/x80.xml (1.1) (added)
+		src/xml/escp2/model/.cvsignore (1.1) (added)
+		src/xml/escp2/model/Makefile.am (1.1) (added)
+		src/xml/escp2/model/model_0.xml (1.1) (added)
+		src/xml/escp2/model/model_1.xml (1.1) (added)
+		src/xml/escp2/model/model_10.xml (1.1) (added)
+		src/xml/escp2/model/model_11.xml (1.1) (added)
+		src/xml/escp2/model/model_12.xml (1.1) (added)
+		src/xml/escp2/model/model_13.xml (1.1) (added)
+		src/xml/escp2/model/model_14.xml (1.1) (added)
+		src/xml/escp2/model/model_15.xml (1.1) (added)
+		src/xml/escp2/model/model_16.xml (1.1) (added)
+		src/xml/escp2/model/model_17.xml (1.1) (added)
+		src/xml/escp2/model/model_18.xml (1.1) (added)
+		src/xml/escp2/model/model_19.xml (1.1) (added)
+		src/xml/escp2/model/model_2.xml (1.1) (added)
+		src/xml/escp2/model/model_20.xml (1.1) (added)
+		src/xml/escp2/model/model_21.xml (1.1) (added)
+		src/xml/escp2/model/model_22.xml (1.1) (added)
+		src/xml/escp2/model/model_23.xml (1.1) (added)
+		src/xml/escp2/model/model_24.xml (1.1) (added)
+		src/xml/escp2/model/model_25.xml (1.1) (added)
+		src/xml/escp2/model/model_26.xml (1.1) (added)
+		src/xml/escp2/model/model_27.xml (1.1) (added)
+		src/xml/escp2/model/model_28.xml (1.1) (added)
+		src/xml/escp2/model/model_29.xml (1.1) (added)
+		src/xml/escp2/model/model_3.xml (1.1) (added)
+		src/xml/escp2/model/model_30.xml (1.1) (added)
+		src/xml/escp2/model/model_31.xml (1.1) (added)
+		src/xml/escp2/model/model_32.xml (1.1) (added)
+		src/xml/escp2/model/model_33.xml (1.1) (added)
+		src/xml/escp2/model/model_34.xml (1.1) (added)
+		src/xml/escp2/model/model_35.xml (1.1) (added)
+		src/xml/escp2/model/model_36.xml (1.1) (added)
+		src/xml/escp2/model/model_37.xml (1.1) (added)
+		src/xml/escp2/model/model_38.xml (1.1) (added)
+		src/xml/escp2/model/model_39.xml (1.1) (added)
+		src/xml/escp2/model/model_4.xml (1.1) (added)
+		src/xml/escp2/model/model_40.xml (1.1) (added)
+		src/xml/escp2/model/model_41.xml (1.1) (added)
+		src/xml/escp2/model/model_42.xml (1.1) (added)
+		src/xml/escp2/model/model_43.xml (1.1) (added)
+		src/xml/escp2/model/model_44.xml (1.1) (added)
+		src/xml/escp2/model/model_45.xml (1.1) (added)
+		src/xml/escp2/model/model_46.xml (1.1) (added)
+		src/xml/escp2/model/model_47.xml (1.1) (added)
+		src/xml/escp2/model/model_48.xml (1.1) (added)
+		src/xml/escp2/model/model_49.xml (1.1) (added)
+		src/xml/escp2/model/model_5.xml (1.1) (added)
+		src/xml/escp2/model/model_50.xml (1.1) (added)
+		src/xml/escp2/model/model_51.xml (1.1) (added)
+		src/xml/escp2/model/model_52.xml (1.1) (added)
+		src/xml/escp2/model/model_53.xml (1.1) (added)
+		src/xml/escp2/model/model_54.xml (1.1) (added)
+		src/xml/escp2/model/model_55.xml (1.1) (added)
+		src/xml/escp2/model/model_56.xml (1.1) (added)
+		src/xml/escp2/model/model_57.xml (1.1) (added)
+		src/xml/escp2/model/model_58.xml (1.1) (added)
+		src/xml/escp2/model/model_59.xml (1.1) (added)
+		src/xml/escp2/model/model_6.xml (1.1) (added)
+		src/xml/escp2/model/model_60.xml (1.1) (added)
+		src/xml/escp2/model/model_61.xml (1.1) (added)
+		src/xml/escp2/model/model_62.xml (1.1) (added)
+		src/xml/escp2/model/model_63.xml (1.1) (added)
+		src/xml/escp2/model/model_64.xml (1.1) (added)
+		src/xml/escp2/model/model_65.xml (1.1) (added)
+		src/xml/escp2/model/model_66.xml (1.1) (added)
+		src/xml/escp2/model/model_67.xml (1.1) (added)
+		src/xml/escp2/model/model_68.xml (1.1) (added)
+		src/xml/escp2/model/model_69.xml (1.1) (added)
+		src/xml/escp2/model/model_7.xml (1.1) (added)
+		src/xml/escp2/model/model_70.xml (1.1) (added)
+		src/xml/escp2/model/model_71.xml (1.1) (added)
+		src/xml/escp2/model/model_72.xml (1.1) (added)
+		src/xml/escp2/model/model_73.xml (1.1) (added)
+		src/xml/escp2/model/model_74.xml (1.1) (added)
+		src/xml/escp2/model/model_75.xml (1.1) (added)
+		src/xml/escp2/model/model_76.xml (1.1) (added)
+		src/xml/escp2/model/model_77.xml (1.1) (added)
+		src/xml/escp2/model/model_78.xml (1.1) (added)
+		src/xml/escp2/model/model_79.xml (1.1) (added)
+		src/xml/escp2/model/model_8.xml (1.1) (added)
+		src/xml/escp2/model/model_80.xml (1.1) (added)
+		src/xml/escp2/model/model_81.xml (1.1) (added)
+		src/xml/escp2/model/model_82.xml (1.1) (added)
+		src/xml/escp2/model/model_83.xml (1.1) (added)
+		src/xml/escp2/model/model_84.xml (1.1) (added)
+		src/xml/escp2/model/model_85.xml (1.1) (added)
+		src/xml/escp2/model/model_86.xml (1.1) (added)
+		src/xml/escp2/model/model_87.xml (1.1) (added)
+		src/xml/escp2/model/model_9.xml (1.1) (added)
+		src/xml/papers.xml (1.1) (added)
+		src/xml/printers.xml (1.1) (added)
+		test/run-testdither (1.13) (+1 -1)
+		test/run-weavetest (1.25) (+1 -1)
+
+	Start converting Epson driver data to XML.
+
+	Stage 1: Convert existing paper data into XML and verify current
+	      	 functionality.
+
+	      	 This also includes creating a top level XML model file for
+	      	 each distinct printer model (there's a 1-1 mapping between
+	      	 the models in escp2-printers.c and the model files).
+
+		 All of these XML files are going into an escp2 subdirectory
+	      	 of the top level XML directory.  The model files will go into
+	      	 a "model" subdirectory, and the paper files will go into a
+	      	 "media" subdirectory.
+
+		 The media definition will be able to express capabilities on
+	      	 a per-media type, per-inkset, and per-resolution basis.  The
+	      	 actual data will be made available to the rest of the package
+	      	 through an stp_vars_t.
+
+		 I'm creating this data using the existing 5.2 beta tree and a
+	      	 small program to generate the XML.
+
+		 I'm verifying existing functionality by means of md5 checksum
+	      	 verification using the testpattern-2 test.
+
+		 Note that the existing mechanical sequence information will
+	      	 be made available as advanced options, some of them integer
+	      	 and some of them floating point.  Things like vacuum
+	      	 intensity and feed adjustment are exposed by the OEM driver,
+	      	 so we should expose them also.
+
+		 This stage will not be checked in.
+
+	Stage 2: Move all of the XML files from src/main to src/xml.
+
+	      	 This requires creating the appropriate makefile structure and
+	      	 scrubbing all uses of STP_DATA_PATH within the source tree.
+
+		 Functionality will be verified in the same way.  I will also
+	      	 verify that an installation works correctly.
+
+2008-06-01	<rlk@sourceforge.net>
+
+	Files:	src/main/dither-ordered.c (1.30) (+1 -11)
+
+	Remove spurious (and incorrect) comment.
+
+2008-06-01	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.68) (+819 -1013)
+
+	Updated Dutch translation
+
+2008-05-23	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2-data.c (1.249) (+3 -3)
+		src/main/print-escp2.c (1.391) (+20 -18)
+
+	Fix duplex printing on B500
+
+2008-05-20	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/vars.h (1.5) (+126 -10)
+		include/gutenprint/xml.h (1.3) (+10 -2)
+		src/main/print-vars.c (1.82) (+432 -47)
+		src/main/printers.c (1.84) (+3 -102)
+		src/main/xml.c (1.39) (+124 -1)
+
+	Add some additional operations on stp_vars_t
+
+2008-05-17	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.78) (+17 -13)
+		src/main/escp2-inks.c (1.64) (+9 -7)
+		src/main/escp2-papers.c (1.110) (+25 -19)
+		src/main/escp2-resolutions.c (1.46) (+25 -19)
+		src/main/print-escp2.c (1.390) (+2 -2)
+
+	Do not attempt to print debug message with possible null pointer
+
+2008-05-17	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.13) (+5 -1)
+
+	Check ink sets also.
+
+	Add -f to specify families to test.
+
+2008-05-14	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.95) (+43 -40)
+
+	Minor cleanup
+
+2008-05-14	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.20) (+9 -4)
+
+	Reset the vertical position on form feed.
+
+2008-05-12	<rlk@sourceforge.net>
+
+	Files:	po/hu.po (1.20) (+742 -901)
+
+	Update Hungarian translation
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.25) (+2 -2)
+
+	Update for gettext 0.16
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.94) (+43 -44)
+
+	Print the name of the printer, and any warnings, for status.
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.77) (+3 -3)
+
+	Distinguish between the two black cartridges on the C120.
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.181) (+3 -3)
+
+	Bump required gettext version to 0.16 per Roger Leigh.
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.93) (+43 -4)
+		src/foomatic/foomatic-printermap (1.169) (+2 -0)
+		src/main/escp2-channels.c (1.76) (+142 -1)
+		src/main/escp2-driver.c (1.40) (+13 -3)
+		src/main/escp2-inks.c (1.63) (+28 -1)
+		src/main/escp2-papers.c (1.109) (+64 -1)
+		src/main/escp2-resolutions.c (1.45) (+4 -1)
+		src/main/print-escp2-data.c (1.248) (+29 -1)
+		src/main/print-escp2.c (1.389) (+115 -17)
+		src/main/print-escp2.h (1.119) (+9 -4)
+		src/main/printers.xml (1.230) (+3 -1)
+
+	Preliminary support for B-300, B-500
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.12) (+1 -1)
+
+	Test each media type.
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	src/main/dither-ordered.c (1.29) (+2 -2)
+
+	Fix an initialization warning.
+
+2008-05-11	<rlk@sourceforge.net>
+
+	Files:	src/main/dither-main.c (1.60) (+3 -1)
+
+	Don't accidentally use segmented dither if dither algorithm defaults
+	to adaptive hybrid.
+
+2008-05-08	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.143) (+9 -4)
+
+	Generate information for Macintosh color management (harmless
+	elsewhere)
+
+	Safety check for output order and duplex options (don't use unless
+	they're active, as these are not mandatory).
+
+2008-05-05	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.367) (+33 -0)
+		src/foomatic/foomatic-printermap (1.168) (+34 -0)
+		src/main/printers.xml (1.229) (+35 -1)
+
+	Add additional HP laser printers.
+
+2008-05-04	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.366) (+1 -1)
+
+	Update number of supported printers.
+
+2008-05-04	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.365) (+445 -0)
+		src/foomatic/foomatic-printermap (1.167) (+429 -0)
+		src/main/printers.xml (1.228) (+437 -8)
+
+	Add a number of laser printers from Brother, Epson, Gestetner, Infotec, Lanier, Lexmark, NRG, Ricoh, Samsung, and Savin
+
+2008-05-04	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.39) (+14 -9)
+		src/main/print-escp2-data.c (1.247) (+88 -88)
+		src/main/print-escp2.c (1.388) (+19 -4)
+		src/main/print-escp2.h (1.118) (+6 -2)
+
+	Fix missing line problem in color on CX-3700
+
+===============================================================================
 Name: gutenprint-5_2_0-beta2
 
 2008-04-28	<rlk@sourceforge.net>
@@ -40775,7 +44527,7 @@ Name: print-3_1_6
 
 	Current best stuff
 
-	<@sourceforge.net>
+1999-09-12	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.1) (added)
 		Makefile.in (1.1) (added)
diff --git a/INSTALL b/INSTALL
index 5458714..d3c5b40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
diff --git a/Makefile.am b/Makefile.am
index 576eea8..976ed9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.151 2008/04/12 22:41:01 rlk Exp $
+## $Id: Makefile.am,v 1.154 2008/10/06 12:38:07 rlk Exp $
 ## Copyright (C) 2000-2004 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@ include $(top_srcdir)/scripts/global.mk
 SUBDIRS = include src samples test po man doc scripts
 DISTDIRS = m4 m4extra
 
+docdir = $(datadir)/$(PACKAGE)/doc
 
 ## Rules
 
@@ -38,6 +39,17 @@ libtool: $(LIBTOOL_DEPS)
 	cd $(srcdir); \
 	$(SHELL) ./config.status --recheck
 
+# Don't list ChangeLog as a dependency here because it forces network
+# access, and because it usually runs as superuser rather than the user
+# who normally builds Gutenprint.
+install-data-local: NEWS AUTHORS COPYING README
+	$(mkdir_p) $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(docdir)
+
 # This rather strange-looking code ensures that the change log is only
 # rebuilt if any of the CVS/Entries files have changed since the change log
 # was last built.
@@ -60,7 +72,7 @@ ChangeLog: ChangeLogStamp
 	  echo "ChangeLog: .noupdate found: NOT updating ChangeLog from CVS" ; \
 	elif test -d CVS ; then \
 	  echo "ChangeLog: Updating ChangeLog from CVS" ; \
-	  cvs log | $(PERL) scripts/mkchlog > ChangeLog.tmp ; \
+	  cvs log | $(PERL) scripts/mkchlog -e @sourceforge.net -X src/xml/escp2/resolutions -s '^(guten|gimp-|)print-[0-9]+_' > ChangeLog.tmp ; \
 	  if test -s ChangeLog.tmp ; then \
 	    mv ChangeLog.tmp ChangeLog ; \
 	  else \
@@ -196,7 +208,7 @@ MAINTAINERCLEANFILES = \
 	$(CLEANMFOUR) \
 	$(CLEANPO)
 
-EXTRA_DIST = autogen.sh ChangeLogStamp
+EXTRA_DIST = autogen.sh ChangeLogStamp README.package
 
 .PHONY: deb html install-cups install-gimp install-ghost snapshot ChangeLogPhony dist-time-check
 
diff --git a/Makefile.in b/Makefile.in
index bf25664..ac8309a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,7 +45,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -112,6 +113,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -132,6 +134,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -164,6 +167,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -184,9 +188,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -213,6 +218,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -243,7 +249,7 @@ cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = @docdir@
+docdir = $(datadir)/$(PACKAGE)/doc
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
@@ -340,7 +346,7 @@ MAINTAINERCLEANFILES = \
 	$(CLEANMFOUR) \
 	$(CLEANPO)
 
-EXTRA_DIST = autogen.sh ChangeLogStamp
+EXTRA_DIST = autogen.sh ChangeLogStamp README.package
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -480,8 +486,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -506,8 +512,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -517,13 +523,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -602,6 +607,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -628,6 +637,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -735,7 +746,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-data-local
 
 install-dvi: install-dvi-recursive
 
@@ -775,18 +786,19 @@ uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
 
 
 @SET_MAKE@
@@ -810,6 +822,17 @@ libtool: $(LIBTOOL_DEPS)
 	cd $(srcdir); \
 	$(SHELL) ./config.status --recheck
 
+# Don't list ChangeLog as a dependency here because it forces network
+# access, and because it usually runs as superuser rather than the user
+# who normally builds Gutenprint.
+install-data-local: NEWS AUTHORS COPYING README
+	$(mkdir_p) $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(docdir)
+
 # This rather strange-looking code ensures that the change log is only
 # rebuilt if any of the CVS/Entries files have changed since the change log
 # was last built.
@@ -832,7 +855,7 @@ ChangeLog: ChangeLogStamp
 	  echo "ChangeLog: .noupdate found: NOT updating ChangeLog from CVS" ; \
 	elif test -d CVS ; then \
 	  echo "ChangeLog: Updating ChangeLog from CVS" ; \
-	  cvs log | $(PERL) scripts/mkchlog > ChangeLog.tmp ; \
+	  cvs log | $(PERL) scripts/mkchlog -e @sourceforge.net -X src/xml/escp2/resolutions -s '^(guten|gimp-|)print-[0-9]+_' > ChangeLog.tmp ; \
 	  if test -s ChangeLog.tmp ; then \
 	    mv ChangeLog.tmp ChangeLog ; \
 	  else \
diff --git a/NEWS b/NEWS
index d992963..7acf53a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,32 +1,37 @@
-Welcome to Gutenprint 5.2.0-beta2 (5.1.98.2)!  Please read these
-release notes carefully.
+Welcome to Gutenprint 5.2.1, the initial release of Gutenprint 5.2.
+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.  These drivers provide high quality printing for UNIX, Linux,
-and Macintosh OS X (10.2 and above) systems.  Gutenprint includes CUPS
-and Foomatic drivers, and an enhanced Print plug-in for GIMP that
-replaces the print plug-in packaged with the GIMP distribution.
+others.  Gutenprint currently supports over 1400 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
+the print plug-in packaged with the GIMP distribution.
 
-Gutenprint currently supports almost 900 printer models.
+Gutenprint 5.2 no longer supports Macintosh OS X 10.2.
 
-Gutenprint 5.2.0-beta1 is the first beta release of Gutenprint 5.2.
-
-*** NOTE TO PACKAGERS: This is a beta release of the forthcoming 5.2
-    stable release.  As of 5.2 and until further notice, Gutenprint
-    will no longer deliver separate "development" and "stable" release
-    series.
+*** NOTE TO PACKAGERS: Please read the file README.package for issues
+    that are of interest to distributors and packagers of Gutenprint.
+    It is not necessary for end users of Gutenprint to read this file.
 
 These release notes contain the following sections:
 
 I)    General Requirements
-II)   Changes from Previous Releases
-	* Changes from Gutenprint 5.2.0-beta1
-        * General changes from Gutenprint 5.0
-	* Changes from Gutenprint 5.0.2 and 5.1.7
-	* Changes from Gutenprint 5.0.2 only
-	* Changes from Gutenprint 5.1.7 only
-III)   Exceptions and Workarounds
+II)   Critical Upgrade Note
+III)  Changes from Previous Releases
+        * Changes from 5.2.0-rc1
+        * Changes from 5.2.0-beta4
+IV)   Overall changes from 5.0.2 to 5.2
+	A) General User-visible Changes
+	B) New Functionality
+	C) Changes to the Enhanced Print plugin for GIMP
+	D) Changes to the CUPS interface
+	E) Changes to the Foomatic interface
+	F) Quality Improvements
+	G) Architectural Changes
+	H) New Printers Supported in this Release
+V)    Exceptions and Workarounds
 	A) General Issues
 	B) Build/Installation Issues
 
@@ -36,7 +41,7 @@ III)   Exceptions and Workarounds
 I) GENERAL REQUIREMENTS
 
 Gutenprint will run on any reasonably modern computer running Linux,
-Macintosh OS X (10.2 or above), Solaris, or any other UNIX-like
+Macintosh OS X (10.3 or above), Solaris, or any other UNIX-like
 operating system.  If you plan to compile this package from source,
 you will also need an ANSI C compiler, such as gcc (recommended).  A
 compiler is not required if you are installing a pre-compiled package.
@@ -57,7 +62,7 @@ For general use, you should have the Common UNIX Printing System, CUPS
 Please the rest of the release notes, in particular the Exceptions and
 Workarounds, for full details on installation, as there is important
 information to be aware of.  CUPS is the printing system used on
-Macintosh OS X 10.2 and above, and many other systems use it.  The
+Macintosh OS X 10.3 and above, and many other systems use it.  The
 combination of CUPS and Gutenprint provides a flexible, general
 purpose printing system capable of producing the highest quality
 output with any of the printers supported by this package.  We
@@ -79,18 +84,12 @@ create a driver that may be built much more easily than traditional
 Ghostscript drivers.  This driver should be used in conjunction with
 Foomatic to configure printers.
 
-Users of Macintosh OS X 10.2 (Jaguar), 10.3 (Panther), 10.4 (Tiger),
-and 10.5 (Leopard) can use this package, as the printing system is
-based on CUPS.  For ease of installation, a pre-built package with
-installer is normally supplied a few days after the release of the
-source package.  We strongly recommend that OS X users use the
-pre-built package rather than attempt to build it themselves.
-
-NOTE: This package will not work with any version of OS X 10.0 and
-10.1 (such as 10.1.5).  The printing system used with these versions
-of OS X is not compatible with Gutenprint.  OS X 10.2 and above use
-CUPS as the basis of the printing system, which is compatible with
-Gutenprint.
+Users of Macintosh 10.3 (Panther), 10.4 (Tiger), and 10.5 (Leopard)
+can use this package, as the printing system is based on CUPS.  For
+ease of installation, a pre-built package with installer is normally
+supplied a few days after the release of the source package.  We
+strongly recommend that OS X users use the pre-built package rather
+than attempt to build it themselves.
 
 The README file included with this package provides full instructions
 for building and installing Gutenprint.
@@ -98,21 +97,290 @@ for building and installing Gutenprint.
 
 ================================================================
 
-II) MAJOR CHANGES FROM PREVIOUS RELEASES
+II) CRITICAL UPGRADE NOTE
+
+If you are using CUPS with Gutenprint on a non-Macintosh system, and
+are upgrading from an earlier version of Gutenprint or Gimp-Print,
+please read this note carefully as there are special procedures that
+you should follow in addition to the normal procedure of running
+cups-genppdupdate.
+
+Background: older versions of Gutenprint distributed CUPS backends,
+named "epson" and "canon", that we have determined have compatibility
+problems on certain systems.  The symptom of this problem is that the
+last page of each print job does not complete; it prints almost to the
+end of the page, and the printer stops.  The only way to clear this
+condition is to power the printer off and back on after each job.
+
+A CUPS "backend" is a special program whose purpose is to transfer
+data from the printer driver to the printer itself.  CUPS provides a
+number of general purpose backends.  The "epson" and "canon" backends
+previously provided with Gutenprint are capable of retrieving ink
+level information from Epson and Canon inkjet printers respectively.
+These backends are no longer needed in CUPS 1.2, and are not strictly
+necessary in CUPS 1.1.  Therefore, these backends have been removed
+from Gutenprint as of 5.2.
+
+Due to a subtle issue, these backends may not correctly send all of
+the data to the printer on some systems.  While we have not fully
+characterized the systems on which this happens, it appears likely
+that it is on certain operating system versions.  The backend believes
+that all data has been sent, but the way it does I/O results in some
+data not being sent on all systems.  As a result, the printer
+continues to wait for more data to be received.
+
+We recommend that if you have any printer queues using these backends
+that you modify the queues to use a different backend.  Even if you
+are not currently having problems, we recommend that you do this, as a
+future operating system upgrade may result in this problem becoming
+visible.  If this is the first version of Gutenprint or Gimp-Print you
+have installed on your system, you should not have these backends
+present.  Here are the steps we recommend that you follow.
+
+1) Determine whether any printers on your system use the epson or
+   canon backends.
+
+   This can be determined via "lpstat -v".  This may be done without
+   administrator privileges:
+
+      $ lpstat -v
+      device for EPSON_Stylus_Photo_R300_USB_1: usb://EPSON/Stylus%20Photo%20R300
+      device for espr300-ez: usb://EPSON/Stylus%20Photo%20R300
+      device for r300-test: epson:/dev/usb/lp0
+      device for HP_LaserJet_1022_USB_1: usb://HP/LaserJet%201022
+
+   Inspect each device line for a device that begins with "epson:" or
+   "canon:".  These are the queues you must modify.  In this case, the
+   only queue that must be modified is "r300-test".  The other queues
+   all have devices that begin with "usb:"; these queues use the
+   standard CUPS USB backend that does not have this problem.
+
+2) For each queue that uses the epson or canon backend, modify it to
+   use an appropriate backend.
+
+   If your system provides a user interface for administering
+   printers, we recommend that you use that interface.  If you're
+   comfortable with the KDE or GNOME print manager, you may use that
+   interface.  However, we recommend using the CUPS web interface
+   (http://localhost:631/printers) to modify the printer.  The steps
+   you should follow (assuming that you are using the CUPS web
+   interface) are:
+
+   i) Click "Modify Printer", to start leading you through a series of
+      screens allowing you to change the printer properties.
+
+   ii) The first screen, entitled "Modify Printer r300-test" (the
+      printer name, of course, will vary), will display the name of
+      the printer, along with the location and description.  You may
+      modify these if you wish, but it isn't necessary.  Click
+      "Continue".
+
+   iii) The next screen, entitled "Device for r300-test", is the
+      important one.  This provides you a drop-down list of devices.
+      These devices typically include "AppSocket/HP JetDirect",
+      "LP#1", and so forth.  It is critical that you select the
+      correct device at this point.
+
+      The entries that you want are of the form
+
+      EPSON Stylus Photo R300 USB #1 (EPSON Stylus Photo R300)
+
+      or
+
+      EPSON Stylus Photo EX Parallel #1 (EPSON Stylus Photo EX)
+
+      Make sure to select the one that's appropriate for your printer
+      model.
+
+      You will likely also see entries such as "Gutenprint USB Printer
+      #1 (EPSON USB2.0 Printer (Hi-speed)".  These are the entries
+      corresponding to the "epson" and "canon" backends, and you must
+      avoid these.
+
+   iv) The next screen, entitled "Make/Manufacturer for r300-test",
+      allows you to select the manufacturer of the printer.  Normally,
+      the correct manufacturer (Epson or Canon) will be highlighted,
+      and you can click Continue.
+
+   v) The next screen, entitled "Model/Driver for r300-test", allows
+      you to select the precise model of the printer.  Normally, the
+      correct model (which will be named something like "Epson Stylus
+      Photo R300 - CUPS+Gutenprint v5.2.0-rc1") will already be
+      highlighted, and you can click "Modify Printer".  Otherwise, you
+      must find and select the correct printer model before clicking
+      Modify Printer.  You will likely need to provide your
+      administrator username and password to continue here.
+
+      After this, you should see a message "Printer r300-test modified
+      successfully".
+
+3) Remove the epson and canon backends.
+
+   On most systems, the backends will be named
+   /usr/lib/cups/backend/canon and /usr/lib/cups/backend/epson.  On
+   some systems, the backends will be named
+   /usr/lib64/cups/backend/canon and /usr/lib64/cups/backend/epson.
+   They may be present in other locations, but these are the most
+   common locations.  If these files are present, you should create a
+   directory named /usr/lib/cups/old-backend or
+   /usr/lib64/cups/old-backend, and move the epson and canon backends
+   there just in case you later need them.
+
+      % cd /usr/lib/cups
+      % sudo mkdir old-backend
+      Password: <type your administrator password>
+      % cd backend
+      % sudo mv canon epson ../old-backend
+      Password: <retype your administrator password if prompted>
+
+The specific underlying technical problem appears to be that when at
+least certain devices are in non-blocking mode (O_NONBLOCK or
+O_NDELAY) with certain operating system versions (Linux 2.6.25 appears
+to be suffer this problem, and most likely some other versions also
+do), the close() call does not result in all data being flushed to the
+device.  We have determined that the data is in fact written by the
+"epson" process, but it's never getting to the printer.
 
-* CHANGES FROM GUTENPRINT 5.2.0-BETA1:
+================================================================
 
-   This release fixes a fatal bug that causes Gutenprint 5.2.0-beta1
-   to not initialize correctly.
+III) MAJOR CHANGES FROM PREVIOUS RELEASES
+
+* Changes from 5.2.0-rc1
+
+   1) Preliminary support for the following printers.  These printers
+      may be retuned for improved quality or performance in future
+      releases.
+
+      Epson inkjet printers:
+
+	Epson PictureMate 215
+	Epson PX 101
+	Epson PX 201
+	Epson PX 601F
+	Epson Stylus CX9300F
+	Epson Stylus CX9400F
+	Epson Stylus CX9475F
+	Epson Stylus DX9400F
+	Epson Stylus NX200
+	Epson Stylus NX400
+	Epson Stylus Photo R290
+	Epson Stylus Photo RX610
+	Epson Stylus Photo RX690
+	Epson Stylus Office B30
+	Epson Stylus Office B33
+	Epson Stylus Office B40W
+	Epson Stylus Office T30
+	Epson Stylus Office T33
+	Epson Stylus Office T40W
+	Epson Stylus Office BX300F
+	Epson Stylus Office BX600FW
+	Epson Stylus Office SX600FW
+	Epson Stylus Office TX300F
+	Epson Stylus Office TX600FW
+	Epson Stylus SX200
+	Epson Stylus SX205
+	Epson Stylus SX400
+	Epson Stylus SX405
+	Epson Stylus TX200
+	Epson Stylus TX400
+	Epson ME Office 70
+	Epson ME Office 80W
+	Epson ME Office 700FW
+	Epson WorkForce 30
+	Epson WorkForce 40
+	Epson WorkForce 500
+	Epson WorkForce 600
+
+   2) Experimental support for the following printers.  These printers
+      may not function correctly, and may be retuned for improved
+      quality or performance in future releases.
+
+      Epson inkjet printers:
+
+	Epson Artisan 700
+	Epson Artisan 800
+	Epson Stylus NX100
+	Epson Stylus NX300
+	Epson Stylus PX700FW
+	Epson Stylus PX800FW
+	Epson Stylus S20
+	Epson Stylus SX100
+	Epson Stylus SX105
+	Epson Stylus T20
+	Epson Stylus TX100
+	Epson Stylus Photo TX700W
+	Epson Stylus Photo TX800W
+
+   3) The ChangeLog, NEWS, AUTHORS, COPYING, and README files are
+      installed into the documentation directory.
+
+
+* Changes from 5.2.0-beta4
+
+   1) cups-genppdupdate now preserves the language of the original PPD
+      file, even if the PPD file is being converted to a globalized
+      PPD file.  This enables use of cups-genppdupdate -loriginal to
+      restore the previous language of the PPD file.  Note that
+      cups-genppdupdate -l<language> changes the stored language of
+      the PPD file.
+
+   2) The CUPS driver correctly prints page sizes larger than letter
+      on PCL printers (this was broken in 5.2.0-beta4 only).
+
+   3) The CD position on the R1900 has been corrected.
+
+   4) Printing on the Epson Stylus DX8400/DX8450 has been corrected
+      (the CX8400 was corrected in the previous release).  Previously,
+      these printers fed paper endlessly without printing.
+
+   5) The user manual has been updated.
+
+   6) Color and tonal correctness at low and medium resolutions has
+      been fixed on many Epson Stylus multi-function devices,
+      including
+
+      Stylus CX3500, Stylus CX3600, Stylus CX3650, Stylus CX5100,
+      Stylus CX4200, Stylus CX4500, Stylus CX4600, Stylus CX4700,
+      Stylus CX4800, Stylus CX4900, Stylus CX5000, Stylus CX5000F,
+      Stylus CX5700, Stylus CX5800, Stylus CX6000, Stylus CX7000F,
+      Stylus CX7800, Stylus CX8300, Stylus CX8400, Stylus CX9400,
+      Stylus DX4200, Stylus DX4250, Stylus DX4800, Stylus DX7000F,
+      Stylus DX8400, Stylus DX8450, PX A650
+
+      This issue affected printing at 720 DPI and below.  This issue
+      was fixed for the Stylus CX7400, Stylus DX7400, and Stylus
+      DX7450 in Gutenprint 5.2.0-beta4, but not on other printers at
+      that time.  Since then, we have determined that the same fix is
+      needed on these printers.
+
+      Output will be quite grainy at these resolutions, but colors
+      will be correct.
 
-----------------
 
-* GENERAL CHANGES FROM GUTENPRINT 5.0:
+================================================================
+
+IV) OVERALL CHANGES FROM 5.0.2 TO 5.2
+
+A) GENERAL USER-VISIBLE CHANGES
 
    1) Gutenprint 5.2 and beyond no longer support GIMP 1.2.  Please
       ensure that you are using GIMP 2.0 or above.
 
-   2) The PostScript driver has been rewritten, offering enhanced
+   2) Gutenprint 5.2 no longer supports Macintosh OS X 10.2; it now
+      requires 10.3 (Panther) or higher.  This is due to a new library
+      requirement (for the iconv library) that is not present in 10.2.
+
+   3) Color Correction is now shown on the basic output adjustment
+      menu rather than the advanced menu.
+
+   4) We recommend that any profiles created against Gutenprint 5.1 or
+      earlier releases be checked, and if necessary, re-created for
+      use with Gutenprint 5.2.
+
+
+B) NEW FUNCTIONALITY
+
+   1) The PostScript driver has been rewritten, offering enhanced
       functionality approaching that of the native printer drivers.
       This driver is used by the enhanced Print plugin for the GIMP,
       and by other packages (such as PhotoPrint) that utilize
@@ -127,14 +395,106 @@ II) MAJOR CHANGES FROM PREVIOUS RELEASES
         the native CUPS driver, not from Foomatic) and presents
         floating point options correctly.
 
-	Note that this driver does not offer the curve options offered
-	by the native drivers.
+      Note that this driver does not offer the curve options offered
+      by the native drivers.  If no PPD file is selected, a basic set
+      of options is provided.
 
-----------------
+   2) Envelope paper sizes are now offered in both portrait and
+      landscape form factor, as some printers expect envelopes to be
+      fed long edge first while some expect them to be fed short edge
+      first.
+
+   3) PCL laser printers now offer paper trays with adjustable guides.
+      Many laser printers use adjustable guides for manual feed of
+      papers narrower than letter size.
+
+   4) In addition to support for specific laser printers listed below,
+      support for generic large format PCL laser printers has been
+      added.  Note that all PCL laser printers are supported in black
+      and white only.
+
+   5) Quality presets have been added to the PCL driver (HP inkjets
+      and HP and other laser printers).
+
+   6) L-size photo paper (3 1/2x5 inches) has been added.
 
-* CHANGES FROM GUTENPRINT 5.0.2 AND 5.1.7:
 
-   1) cups-genppdupdate is no longer versioned, as it was in 5.0 and
+C) CHANGES TO THE ENHANCED PRINT PLUGIN FOR GIMP
+
+   1) The GIMP plugin now offers additional options for many Epson
+      inkjet printers, allowing precise specification of drop sizes if
+      desired.
+
+   2) A problem with determining the system printer queues in the GIMP
+      plugin on certain systems using languages other than English has
+      been fixed.
+
+   3) The GIMP plugin now offers reset buttons for individual
+      settings, so it is possible to reset a single setting to its
+      default without resetting all settings.
+
+
+D) CHANGES TO THE CUPS INTERFACE
+
+   1) PPD files generated by cups-genppd and the CUPS driver interface
+      (gutenprint.5.2) now include, by default, all localizations in a
+      single file.  This is referred to as "globalized PPD files".
+      This functionality is supported by CUPS 1.2 and higher.
+      Single-language PPD files are still generated on request, or if
+      CUPS 1.1 is in use.  The CUPS driver is now localized using
+      built-in code, eliminating problems with PPD files not always
+      being translated properly.
+
+      cups-genppdupdate will normally upgrade all PPD files to
+      globalized ones if CUPS 1.2 or higher is in use or if
+      pregenerated PPD files are used, but will otherwise generate
+      single-language files.  This behavior can be controlled as
+      follows:
+
+      - If -l<language> is passed to cups-genppdupdate, it will be
+	honored no matter what release of Gutenprint is in use.  This
+	may be used if applications have issues with globalized PPD
+	files.  We would like reports of any such applications.  The
+	list of languages accepted is as follows:
+
+	C	English (US)
+	cs	Czech
+	da	Danish
+	de	German
+	el	Greek
+	en_GB	English (UK)
+	es	Spanish
+	fr	French
+	hu	Hungarian
+	ja	Japanese
+	nb	Norwegian
+	nl	Dutch
+	pl	Polish
+	pt	Portuguese
+	sk	Slovak
+	sv	Swedish
+	zh_TW	Simplified Chinese
+
+      - If -loriginal is passed, the original language of the PPD file
+	will be honored.
+
+      - If no -l option is passed, the original language will be
+	honored if -r5.0 or -r5.1 is passed (i. e. if cups-genppdupdate
+	is used to downgrade to an older version of Gutenprint), or if
+	CUPS 1.1 is in used.
+
+      - A new configure option --enable-globalized-cups-ppds (or if not
+	desired, --disable-globalized-cups-ppds) has been added to
+	enable or disable pre-generating globalized PPD files.  This
+	option is only used if --enable-cups-ppds is set.  It defaults
+	to "yes" if CUPS 1.2 or above is in use or "no" if CUPS 1.1 is
+	in use.
+
+   2) The CUPS driver is now localized using built-in code, hopefully
+      eliminating problems with PPD files not always being translated
+      properly.
+
+   3) cups-genppdupdate is no longer versioned, as it was in 5.0 and
       5.1 (cups-genppdupdate.5.0 and cups-genppdupdate.5.1).  It also
       supports the following options:
 
@@ -145,136 +505,108 @@ II) MAJOR CHANGES FROM PREVIOUS RELEASES
 
       -i Interactively ask whether to update each PPD file.
 
-   2) The performance of cups-genppdupdate has been improved
+      -l Specify the language in which to generate PPD files, as
+       	 described above.
+
+   4) The performance of cups-genppdupdate has been improved
       significantly.
 
-   3) cups-genppdupdate no longer updates PPD files that differ only
+   5) cups-genppdupdate no longer updates PPD files that differ only
       in case of the file extension (e. g. printer.ppd and
       printer.PPD).  This avoids updating PPD files twice on
       filesystems that are case insensitive, such as OS X.
 
-   4) cups-genppdconfig has been removed from this release.  This
+   6) cups-genppdconfig has been removed from this release.  This
       command was used to configure CUPS printer queues, but is not
       necessary as there are ample other tools available to configure
       printer queues.
 
-   5) Support for generic large format PCL laser printers has been
-      added.
+   7) The CUPS driver will no longer attempt to find a matching
+      predefined page size when a custom page size is passed in.  This
+      yields more accurate printing sizes for custom paper sizes.  In
+      addition, it avoids a problem with unnecessary margins being
+      imposed when the paper size is approximately 4.7x6.8" (120x173
+      mm) due to a specific defined page size with those dimensions and
+      tear-off borders.
 
-   6) Many translations have been updated.
+   8) Certain legacy applications (most notably Microsoft Office) did
+      not print correctly on printers capable of high resolution, due
+      to inability to handle the specified resolutions.  This release
+      works around that issue by not advertising very high resolutions
+      in a way that these applications will fail on.
 
-   7) The Canon iPixma 4500 has been fixed.
+   9) Progress and error messages produced by the CUPS raster driver
+      are now localized.
 
-   8) L-size photo paper (3 1/2x5 inches) has been added.
+   10) The CUPS driver now provides an Output Order option, where
+      appropriate, in all cases.  This worked prior to 5.2.0-beta3 and
+      was broken in that release only.
 
-----------------
+   11) A problem whereby the CUPS driver could consume excessive
+      amounts of CPU and generate no output with Epson PictureMate and
+      E-series compact photo printers has been fixed.
 
-* CHANGES FROM GUTENPRINT 5.0.2 ONLY:
-
-   1) New printers supported in this release:
-
-      * Epson inkjet printers:
-
-	EPSON PictureMate 100
-	EPSON PictureMate 210 (Corrected)
-	EPSON PictureMate 240 (Corrected)
-	EPSON PictureMate 250 (Corrected)
-	EPSON PictureMate 260
-	EPSON PictureMate 270
-	EPSON PictureMate 280 (Corrected)
-	EPSON PictureMate 290
-	EPSON PictureMate 500
-	EPSON PictureMate 2005
-	EPSON PictureMate Dash
-	EPSON PictureMate Flash (Corrected)
-	EPSON PictureMate Pal (Corrected)
-	EPSON PictureMate Snap (Corrected)
-	EPSON E 150 (Corrected)
-	EPSON E 300
-	EPSON E 520
-	EPSON E 500
-	EPSON E 720
-	EPSON E 700
-	EPSON Stylus D92
-	EPSON Stylus DX4400
-	EPSON Stylus DX4450
-	EPSON Stylus DX7000F
-	EPSON Stylus DX7400
-	EPSON Stylus DX7450
-	EPSON Stylus DX8400
-	EPSON Stylus DX8450
-	EPSON Stylus Photo R280
-	EPSON Stylus Photo R285
-	EPSON Stylus Photo RX585
-	EPSON Stylus Photo RX680
-	EPSON Stylus Photo RX685
-
-	(Note that a number of the PictureMate printers that were
-	previously included generated grossly incorrect output.  Not
-	all of the PictureMate printers have been fully tuned at this
-	point.)
-
-      * Canon inkjet printers:
-        Canon PIXMA MP520 (#1872394)
-	Canon PIXMA iP6000D
-
-   2) Printing for the Canon PIXMA iP4500 has been fixed (#1834153).
-
-   3) Printing near the bottom of the page has been improved for many
-      modern Epson inkjet printers.  In addition, we have determined
-      that most of these printers can print with consistent high
-      quality at 2880x2880 and 5760x2880 DPI.  Therefore, these
-      resolutions will be used for Ultra Photo and Best qualities
-      respectively on these printers.
-
-      Printers affected include:
-
-      * Stylus Photo R800, R1800, PM-G820
-
-      * Stylus Photo R2400
-
-      * All printers using Claria ink
-
-   4) Full bleed printing now works properly on the Epson Stylus Photo
-      R2400.
-
-   5) The Epson Stylus C120 now allows printing at 2880x2880 and
-      5760x2880.  However, print quality near the bottom of the page
-      may be poor, and these settings are therefore not used for Ultra
-      Photo and Best quality.
-
-   6) The ink drop sizes on the Epson Stylus Photo printers using
-      Claria ink have been retuned, yielding improved quality at lower
-      resolutions.
-
-   7) A problem with determining the system printer queues in the GIMP
-      plugin on certain systems using languages other than English has
-      been fixed.
 
-   8) Envelope paper sizes are now offered in both portrait and
-      landscape form factor, as some printers expect envelopes to be
-      fed long edge first while some expect them to be fed short edge
-      first.
+E) CHANGES TO THE FOOMATIC INTERFACE
 
-   9) PCL laser printers now offer paper trays with adjustable guides.
-      Many laser printers use adjustable guides for manual feed of
-      papers narrower than letter size.
+   1) The Foomatic-based driver will only attempt to find a precisely
+      matching page size when a custom page size is passed in.  This
+      yields more accurate printing sizes for custom paper sizes.
 
-   10) The GIMP plugin now offers reset buttons for individual
-      settings, so it is possible to reset a single setting to its
-      default without resetting all settings.
 
-   11) A new dither algorithm, Ordered New, has been added.  This
+F) QUALITY IMPROVEMENTS
+
+   1) A number of improvements have been made to the Epson driver:
+
+      - Borderless printing and in general printing near the bottom of
+      	the page has been improved for many Epson inkjet printers.
+
+      - Additional very high resolutions (2880x2880 and 5760x2880 DPI)
+      	have been added for many modern (post-2005) printers.  These
+      	resolutions may be useful when one desires the absolute best
+      	print quality.
+
+      - Additional enhanced low and intermediate resolutions have been
+        added for some Epson printers to reduce banding while still
+        achieving good output performance and quality.
+
+      - Printing speed, and in some cases quality, has been improved
+        on many modern Epson printers.
+
+      - Ink drop size has been retuned on printers using Claria inks,
+        yielding improved quality at lower resolutions.
+
+      - Borderless support has been added to the Epson Stylus Pro
+	7600/9600 and the margins have been corrected.
+
+      - Epson printers will now correctly handle color output if
+	quadtone inks are in use by printing in grayscale even though
+	color is specified.
+
+      - The Epson Stylus CX8300 and CX8400 now print correctly, although
+	the colors may be retuned before final release.
+
+      - The Epson Stylus CX7400, DX7400, and DX7450 now print correctly
+	at all resolutions.  Previously, printing at 720x360 DPI or below
+	was incorrect.  Output will be rather grainy.
+
+      - A problem whereby some rows are not printed in color on the Epson
+	Stylus CX3700 and related printers has been fixed.
+
+   2) Output quality has been improved for certain Canon printers, in
+      particular the PIXMA iP4500 and related printers.
+
+   3) A new dither algorithm, Ordered New, has been added.  This
       dither algorithm is most likely to improve output at low
       resolutions, particularly when printing black and white.  It
       will only help on printers offering multiple drop sizes.
 
-   12) Various new controls and settings have been added to assist in
+   4) Various new controls and settings have been added to assist in
       printer calibration.  While the tools for using these controls
       are not yet created, these tools will assist in calibrating
       printers in the future.
 
-      * The Epson driver now offers additional controls for adjusting
+      - The Epson driver now offers additional controls for adjusting
       	the relationship between light and dark ink:
 
 	+ The Value parameters (such as Light Cyan Value) specify the
@@ -288,11 +620,11 @@ II) MAJOR CHANGES FROM PREVIOUS RELEASES
 	  used (essentially the density of the light ink).  This is
 	  the same as the parameters previously called Cutoff.
 
-      * The Epson driver now exposes as defaults the actual GCR
+      - The Epson driver now exposes as defaults the actual GCR
         settings used for the printer, paper, and ink combination in
         use.
 
-      * The Epson driver now allows passing low level settings such as
+      - The Epson driver now allows passing low level settings such as
         printer base resolution, ink drop size selection, and relative
         ink drop size as parameters.  The ink drop size can be
         accessed in the GIMP plugin, while the base resolution and ink
@@ -300,7 +632,7 @@ II) MAJOR CHANGES FROM PREVIOUS RELEASES
         generator or other application that allows setting integer
         parameters.
 
-      * Two new dither algorithms, Segmented and Segmented New, have
+      - Two new dither algorithms, Segmented and Segmented New, have
 	been added.  These are not intended for normal use, and will
 	normally behave like Ordered and Ordered New.  However, if Raw
 	color correction is selected and a printer with multiple drop
@@ -317,7 +649,7 @@ II) MAJOR CHANGES FROM PREVIOUS RELEASES
 	This is intended to assist in tuning ink drop sizes and is not
 	normally useful otherwise.
 
-      * A new parameter allowing dumping out of color correction state
+      - A new parameter allowing dumping out of color correction state
 	(lookup tables, GCR data, curves, etc.) has been added, and is
 	accessible in the GIMP plugin.  At present, this data cannot
 	be used directly, but it is intended that in the future this
@@ -325,206 +657,703 @@ II) MAJOR CHANGES FROM PREVIOUS RELEASES
 	and restored.
 
 
-----------------
-
-* CHANGES FROM GUTENPRINT 5.1.7 ONLY:
-
-   1) The following HP inkjet printers are now supported.  Support for
-      these printers was dropped in 5.1.4, but is now restored as some
-      users have no alternative options.  We recommend that where
-      possible users switch to the HPIJS driver package (the printer
-      part of HPLIP), available from http://hplip.sourceforge.net.
-      The HPIJS package is licensed under the GPL and BSD licenses.
-
-	HP Business Inkjet 2200
-	HP Business Inkjet 2230
-	HP Business Inkjet 2250
-	HP Business Inkjet 2250TN
-	HP Business Inkjet 2280
-	HP Color Inkjet Printer CP1160
-	HP Color Inkjet Printer CP1700
-	HP Color LaserJet 2500
-	HP Color LaserJet 4500
-	HP Color LaserJet 4550
-	HP Color LaserJet 4600
-	HP Color LaserJet 5
-	HP Color LaserJet 5000
-	HP Color LaserJet 5500
-	HP Color LaserJet 8550GN
-	HP DeskJet 400
-	HP DeskJet 420C
-	HP DeskJet 450
-	HP DeskJet 500
-	HP DeskJet 500C
-	HP DeskJet 505J Plus
-	HP DeskJet 510
-	HP DeskJet 520
-	HP DeskJet 540C
-	HP DeskJet 550C
-	HP DeskJet 5550
-	HP DeskJet 5551
-	HP DeskJet 560C
-	HP DeskJet 600
-	HP DeskJet 600C
-	HP DeskJet 610C
-	HP DeskJet 610CL
-	HP DeskJet 6122
-	HP DeskJet 6127
-	HP DeskJet 612C
-	HP DeskJet 640C
-	HP DeskJet 648C
-	HP DeskJet 660C
-	HP DeskJet 670C
-	HP DeskJet 670TV
-	HP DeskJet 672C
-	HP DeskJet 680C
-	HP DeskJet 682C
-	HP DeskJet 690C
-	HP DeskJet 692C
-	HP DeskJet 693C
-	HP DeskJet 694C
-	HP DeskJet 695C
-	HP DeskJet 697C
-	HP DeskJet 810C
-	HP DeskJet 812C
-	HP DeskJet 815C
-	HP DeskJet 816C
-	HP DeskJet 825C
-	HP DeskJet 830C
-	HP DeskJet 832C
-	HP DeskJet 840C
-	HP DeskJet 841C
-	HP DeskJet 842C
-	HP DeskJet 843C
-	HP DeskJet 845C
-	HP DeskJet 850C
-	HP DeskJet 855C
-	HP DeskJet 870C
-	HP DeskJet 880C
-	HP DeskJet 882C
-	HP DeskJet 890C
-	HP DeskJet 895C
-	HP DeskJet 916C
-	HP DeskJet 920C
-	HP DeskJet 9300
-	HP DeskJet 930C
-	HP DeskJet 932C
-	HP DeskJet 933C
-	HP DeskJet 934C
-	HP DeskJet 935C
-	HP DeskJet 940C
-	HP DeskJet 948C
-	HP DeskJet 950C
-	HP DeskJet 952C
-	HP DeskJet 955C
-	HP DeskJet 957C
-	HP DeskJet 959C
-	HP DeskJet 960C
-	HP DeskJet 970C
-	HP DeskJet 975C
-	HP DeskJet 980C
-	HP DeskJet 990C
-	HP DeskJet 995C
-	HP DeskJet 1100C
-	HP DeskJet 1120C
-	HP DeskJet 1125C
-	HP DeskJet 1200C
-	HP DeskJet 1220C
-	HP DeskJet 1600C
-	HP DeskJet 1600CM
-	HP DeskJet 2000
-	HP DeskJet 2500
-	HP DeskJet 2500CM
-	HP DeskJet 340C
-	HP DeskJet 3810
-	HP DeskJet 3816
-	HP DeskJet 3820
-	HP DeskJet 3822
-	HP OfficeJet 300
-	HP OfficeJet 330
-	HP OfficeJet 350
-	HP OfficeJet 500
-	HP OfficeJet 520
-	HP OfficeJet 570
-	HP OfficeJet 580
-	HP OfficeJet 590
-	HP OfficeJet 600
-	HP OfficeJet 610
-	HP OfficeJet 625
-	HP OfficeJet 630
-	HP OfficeJet 635
-	HP OfficeJet 700
-	HP OfficeJet 710
-	HP OfficeJet 720
-	HP OfficeJet 725
-	HP OfficeJet 5105
-	HP OfficeJet 5110
-	HP OfficeJet 5110xi
-	HP OfficeJet 6105
-	HP OfficeJet 6110
-	HP OfficeJet 7110
-	HP OfficeJet 7130
-	HP OfficeJet 7140
-	HP OfficeJet D125
-	HP OfficeJet D135
-	HP OfficeJet D145
-	HP OfficeJet D155
-	HP OfficeJet G55
-	HP OfficeJet G85
-	HP OfficeJet G95
-	HP OfficeJet K60
-	HP OfficeJet K60xi
-	HP OfficeJet K80
-	HP OfficeJet K80xi
-	HP OfficeJet LX
-	HP OfficeJet Pro 1150C
-	HP OfficeJet Pro 1170C
-	HP OfficeJet Pro 1175C
-	HP OfficeJet R40
-	HP OfficeJet R45
-	HP OfficeJet R60
-	HP OfficeJet R65
-	HP OfficeJet R80
-	HP OfficeJet T45
-	HP OfficeJet T65
-	HP OfficeJet V40
-	HP OfficeJet V40xi
-	HP OfficeJet
-	HP PSC 370
-	HP PSC 380
-	HP PSC 500
-	HP PSC 750
-	HP PSC 950
-	HP PSC 950xi
-	HP PSC 2110
-	HP PSC 2150
-	HP PSC 2210
-	HP PhotoSmart 7150
-	HP PhotoSmart 7345
-	HP PhotoSmart 7350
-	HP PhotoSmart 7550
-	HP PhotoSmart P100
-	HP PhotoSmart P130
-	HP PhotoSmart P230
-	HP PhotoSmart P1000
-	HP PhotoSmart P1100
-	HP PhotoSmart P1115
-	HP PhotoSmart P1215
-	HP PhotoSmart P1218
-	HP PhotoSmart P1315
-	HP e-printer e20
+G) ARCHITECTURAL CHANGES
+
+   1) The Epson driver has been significantly rewritten to use data
+      stored in external files external to the binary library.  This
+      allows making improvements, adding new features, and adding new
+      printers without recompiling the source code.
+
+   2) Test coverage has been increased.
+
+
+H) NEW PRINTERS SUPPORTED SINCE GUTENPRINT 5.0.0
+
+   1) Epson inkjet printers:
+
+      B-300
+      B-308
+      B-500DN
+      B-508DN
+      E 150
+      E 300
+      E 500
+      E 520
+      E 700
+      E 720
+      ME Office 70
+      ME Office 700FW
+      ME Office 80W
+      Offirio PX-B300
+      Offirio PX-B500
+      PM 670C
+      PM A820
+      PM D870
+      PM G4500
+      PM G850
+      PX 101
+      PX 201
+      PX 601F
+      PX V780
+      PictureMate 100
+      PictureMate 2005
+      PictureMate 210
+      PictureMate 215
+      PictureMate 240
+      PictureMate 250
+      PictureMate 260
+      PictureMate 270
+      PictureMate 280
+      PictureMate 290
+      PictureMate 500
+      PictureMate Dash
+      PictureMate Flash
+      PictureMate Pal
+      PictureMate Snap
+      Stylus C110
+      Stylus C120
+      Stylus C79+
+      Stylus C87+
+      Stylus CX4400
+      Stylus CX4900
+      Stylus CX5000
+      Stylus CX5000F
+      Stylus CX5500
+      Stylus CX5600
+      Stylus CX6000
+      Stylus CX7000F
+      Stylus CX7400
+      Stylus CX9300F
+      Stylus CX9400
+      Stylus CX9400F
+      Stylus CX9475F
+      Stylus D120
+      Stylus D92
+      Stylus DX4050
+      Stylus DX4400
+      Stylus DX4450
+      Stylus DX7000F
+      Stylus DX7400
+      Stylus DX7450
+      Stylus DX8400
+      Stylus DX8450
+      Stylus DX9400F
+      Stylus NX200
+      Stylus NX400
+      Stylus Office B30
+      Stylus Office B33
+      Stylus Office B40W
+      Stylus Office BX300F
+      Stylus Office BX600FW
+      Stylus Office SX600FW
+      Stylus Office T30
+      Stylus Office T33
+      Stylus Office T40W
+      Stylus Office TX300F
+      Stylus Office TX600FW
+      Stylus Photo 1400
+      Stylus Photo 1410
+      Stylus Photo R230
+      Stylus Photo R240
+      Stylus Photo R245
+      Stylus Photo R260
+      Stylus Photo R265
+      Stylus Photo R270
+      Stylus Photo R280
+      Stylus Photo R285
+      Stylus Photo R290
+      Stylus Photo R350
+      Stylus Photo R360
+      Stylus Photo R380
+      Stylus Photo R390
+      Stylus Photo R1900
+      Stylus Photo RX560
+      Stylus Photo RX580
+      Stylus Photo RX585
+      Stylus Photo RX590
+      Stylus Photo RX595
+      Stylus Photo RX610
+      Stylus Photo RX640
+      Stylus Photo RX680
+      Stylus Photo RX685
+      Stylus Photo RX690
+      Stylus SX200
+      Stylus SX205
+      Stylus SX400
+      Stylus SX405
+      Stylus TX200
+      Stylus TX400
+      WorkForce 30
+      WorkForce 40
+      WorkForce 500
+      WorkForce 600
+      Artisan 700 (experimental)
+      Artisan 800 (experimental)
+      Stylus NX100 (experimental)
+      Stylus NX300 (experimental)
+      Stylus PX700FW (experimental)
+      Stylus PX800FW (experimental)
+      Stylus Photo TX700W (experimental)
+      Stylus Photo TX800W (experimental)
+      Stylus Pro 7800 (experimental)
+      Stylus Pro 7880 (experimental)
+      Stylus Pro 9800 (experimental)
+      Stylus Pro 9880 (experimental)
+      Stylus Pro 11880 (experimental)
+      Stylus S20 (experimental)
+      Stylus SX100 (experimental)
+      Stylus SX105 (experimental)
+      Stylus T20 (experimental)
+      Stylus TX100 (experimental)
+
+   2) Canon inkjet printers:
+
+      BJC5100
+      BJC5500
+      BJC8500
+      PIXMA MP150
+      PIXMA MP170
+      PIXMA MP180
+      PIXMA MP500
+      PIXMA MP520
+      PIXMA MP610
+      PIXMA MP700
+      PIXMA MP710
+      PIXMA MP730
+      PIXMA MP740
+      PIXMA MP750
+      PIXMA MP760
+      PIXMA MP770
+      PIXMA MP780
+      PIXMA MP790
+      PIXMA MP830
+      PIXMA Pro 9500
+      PIXMA iP2000
+      PIXMA iP3000
+      PIXMA iP3100
+      PIXMA iP4100
+      PIXMA iP4200
+      PIXMA iP4300
+      PIXMA iP4500
+      PIXMA iP5000
+      PIXMA iP5200
+      PIXMA iP5300
+      PIXMA iP6000D
+      PIXMA iP6700
+      PIXMA iP8500
+      PIXMA iX5000
+      PIXUS iP3100
+      PIXUS iP4100
+      i560
+      i80
+      i850
+      i860
+      i865
+
+   3) Dye sublimation printers
+
+      Canon CP-10
+      Canon SELPHY ES1 (*)
+      Canon SELPHY ES2 (*)
+      Canon SELPHY ES20 (*)
+      Fujifilm FinePix NX-500
+      Kodak Easyshare Printer
+      Olympus P-S100
+      Shinko CHC S9045
+      Sony DPP-EX5
+      Sony UP-DR100
+
+      (*) Note that these printers may not work on all systems due to
+	  communication requirements.
+
+   4) Lexmark inkjet and compatible printers:
+
+      Compaq IJ1200
+      Lexmark X73
+
+   5) Laser printers (black and white only):
+
+      Brother DCP-8045D
+      Brother HL-1430
+      Brother HL-1450
+      Brother HL-1470N
+      Brother HL-1650
+      Brother HL-1670N
+      Brother HL-1850
+      Brother HL-1870N
+      Brother HL-2060
+      Brother HL-2460
+      Brother HL-2460N
+      Brother HL-5030
+      Brother HL-5040
+      Brother HL-5050
+      Brother HL-5070N
+      Brother HL-5140
+      Brother HL-5150D
+      Brother HL-5170DN
+      Brother HL-7050
+      Brother HL-7050N
+      Epson EPL-N2050
+      Epson EPL-N2050+
+      Epson EPL-N2050PS
+      Epson EPL-N2050PS+
+      Epson EPL-N2120
+      Epson EPL-N2500
+      Epson EPL-N2500PS
+      Epson EPL-N2750
+      Epson EPL-N2750PS
+      Gestetner 10512
+      Gestetner 2212
+      Gestetner 2712
+      Gestetner 3212
+      Gestetner 3502
+      Gestetner 3532
+      Gestetner 4235g
+      Gestetner 4245g
+      Gestetner 4502
+      Gestetner 4532
+      Gestetner 6002
+      Gestetner 7502
+      Gestetner 9002
+      Gestetner DS645G
+      Gestetner DSm415
+      Gestetner DSm416
+      Gestetner DSm615
+      Gestetner DSm616
+      Gestetner DSm618
+      Gestetner DSm618d
+      Gestetner DSm620
+      Gestetner DSm620d
+      Gestetner DSm622
+      Gestetner DSm625
+      Gestetner DSm627
+      Gestetner DSm635
+      Gestetner DSm635G
+      Gestetner DSm645
+      Gestetner DSm651
+      Gestetner DSm660
+      Gestetner DSm675
+      Gestetner DSm7110
+      Gestetner DSm7135
+      Gestetner DSm716
+      Gestetner DSm721d
+      Gestetner DSm725
+      Gestetner DSm725e
+      Gestetner DSm730
+      Gestetner DSm730e
+      Gestetner DSm735
+      Gestetner DSm735G
+      Gestetner DSm735e
+      Gestetner DSm745
+      Gestetner DSm745G
+      Gestetner DSm745e
+      Gestetner DSm755
+      Gestetner DSm765
+      Gestetner DSm775
+      Gestetner DSm790
+      Gestetner MP 161
+      Gestetner MP 1100
+      Gestetner MP 1350
+      Gestetner MP 1600
+      Gestetner MP 2000
+      Gestetner MP 2500
+      Gestetner MP 2510
+      Gestetner MP 2550
+      Gestetner MP 2550B
+      Gestetner MP 3010
+      Gestetner MP 3350
+      Gestetner MP 3350B
+      Gestetner MP 3500
+      Gestetner MP 4000
+      Gestetner MP 4000B
+      Gestetner MP 4500
+      Gestetner MP 5000
+      Gestetner MP 5000B
+      Gestetner MP 5500
+      Gestetner MP 6500
+      Gestetner MP 7500
+      Gestetner MP 9000
+      HP LaserJet 1022
+      HP LaserJet 1160
+      HP LaserJet 1320
+      HP LaserJet 2410
+      HP LaserJet 2420
+      HP LaserJet 2430
+      HP LaserJet 3015
+      HP LaserJet 3020
+      HP LaserJet 3030
+      HP LaserJet 3050
+      HP LaserJet 3052
+      HP LaserJet 3055
+      HP LaserJet 3380
+      HP LaserJet 3390
+      HP LaserJet 3392
+      HP LaserJet 4240
+      HP LaserJet 4250
+      HP LaserJet 4345 mfp
+      HP LaserJet 4350
+      HP LaserJet 5200
+      HP LaserJet 5200L
+      HP LaserJet 9040
+      HP LaserJet 9040 MFP
+      HP LaserJet 9050
+      HP LaserJet 9050 MFP
+      HP LaserJet M3027 MFP
+      HP LaserJet M3035 MFP
+      HP LaserJet M4345 MFP
+      HP LaserJet M5025 MFP
+      HP LaserJet M5035 MFP
+      HP LaserJet P2010
+      HP LaserJet P2015
+      HP LaserJet P3004
+      HP LaserJet P3005
+      Infotec 4353 MF
+      Infotec 4452 MF
+      Infotec IS 2015
+      Infotec IS 2018
+      Infotec IS 2018D
+      Infotec IS 2022
+      Infotec IS 2027
+      Infotec IS 2032
+      Infotec IS 2035
+      Infotec IS 2045
+      Infotec IS 2060
+      Infotec IS 2075
+      Infotec IS 2090
+      Infotec IS 2105
+      Infotec IS 2122
+      Infotec IS 2127
+      Infotec IS 2132
+      Infotec IS 2135
+      Infotec IS 2145
+      Infotec IS 2151
+      Infotec IS 2160
+      Infotec IS 2175
+      Infotec IS 2215
+      Infotec IS 2216
+      Infotec IS 2220
+      Infotec IS 2220D
+      Infotec IS 2225
+      Infotec IS 2230
+      Infotec IS 2235
+      Infotec IS 2245
+      Infotec IS 2255
+      Infotec IS 2265
+      Infotec IS 2275
+      Infotec IS 2316
+      Infotec IS 2320
+      Infotec IS 2325
+      Infotec IS 2416
+      Infotec IS 2425
+      Infotec IS 2430
+      Infotec IS 2435
+      Infotec IS 2445
+      Infotec IS 3090
+      Infotec IS 3110
+      Infotec IS 3135
+      Infotec MP 2550
+      Infotec MP 2550B
+      Infotec MP 3350
+      Infotec MP 3350B
+      Infotec MP 4000
+      Infotec MP 4000B
+      Infotec MP 5000
+      Infotec MP 5000B
+      Lanier 5622
+      Lanier 5627
+      Lanier 5632
+      Lanier 5635
+      Lanier 5645
+      Lanier LD015
+      Lanier LD016
+      Lanier LD035
+      Lanier LD040
+      Lanier LD040B
+      Lanier LD045
+      Lanier LD050
+      Lanier LD050B
+      Lanier LD060
+      Lanier LD075
+      Lanier LD090
+      Lanier LD115
+      Lanier LD116
+      Lanier LD118
+      Lanier LD118d
+      Lanier LD120
+      Lanier LD120d
+      Lanier LD122
+      Lanier LD125
+      Lanier LD127
+      Lanier LD132
+      Lanier LD135
+      Lanier LD145
+      Lanier LD151
+      Lanier LD160
+      Lanier LD175
+      Lanier LD190
+      Lanier LD225
+      Lanier LD230
+      Lanier LD235
+      Lanier LD245
+      Lanier LD255
+      Lanier LD265
+      Lanier LD275
+      Lanier LD316
+      Lanier LD320d
+      Lanier LD325
+      Lanier LD330
+      Lanier LD335
+      Lanier LD345
+      Lanier LD425
+      Lanier LD425B
+      Lanier LD433
+      Lanier LD433B
+      Lanier LD0105
+      Lanier LD1100
+      Lanier LD1135
+      Lanier MP 161
+      Lanier MP 1100
+      Lanier MP 1350
+      Lanier MP 1600
+      Lanier MP 2000
+      Lanier MP 2500
+      Lanier MP 2510
+      Lanier MP 2550
+      Lanier MP 2550B
+      Lanier MP 3010
+      Lanier MP 3350
+      Lanier MP 3350B
+      Lanier MP 3500
+      Lanier MP 4000
+      Lanier MP 4000B
+      Lanier MP 4500
+      Lanier MP 5000
+      Lanier MP 5000B
+      Lanier MP 5500
+      Lanier MP 6500
+      Lanier MP 7500
+      Lanier MP 9000
+      Lexmark Optra E220
+      Lexmark Optra E321
+      NRG 2205
+      NRG 2212
+      NRG 2238
+      NRG 2705
+      NRG 2712
+      NRG 2738
+      NRG 3205
+      NRG 3212
+      NRG 3238
+      NRG 3502
+      NRG 3508
+      NRG 3518
+      NRG 3525
+      NRG 3532
+      NRG 3545
+      NRG 4502
+      NRG 4508
+      NRG 4518
+      NRG 4525
+      NRG 4532
+      NRG 4545
+      NRG 6002
+      NRG 6005
+      NRG 6008
+      NRG 7502
+      NRG 7505
+      NRG 7508
+      NRG 9002
+      NRG 9005
+      NRG 9008
+      NRG 10512
+      NRG 10515
+      NRG 10518
+      NRG DSm415
+      NRG DSm615
+      NRG DSm616
+      NRG DSm618
+      NRG DSm618d
+      NRG DSm620
+      NRG DSm620d
+      NRG DSm622
+      NRG DSm627
+      NRG DSm632
+      NRG DSm635
+      NRG DSm645
+      NRG DSm651
+      NRG DSm660
+      NRG DSm675
+      NRG DSm725
+      NRG DSm730
+      NRG DSm735
+      NRG DSm745
+      NRG MP 161
+      NRG MP 1100
+      NRG MP 1350
+      NRG MP 1600
+      NRG MP 2000
+      NRG MP 2500
+      NRG MP 2510
+      NRG MP 2550
+      NRG MP 2550B
+      NRG MP 3010
+      NRG MP 3350
+      NRG MP 3350B
+      NRG MP 3500
+      NRG MP 4000
+      NRG MP 4000B
+      NRG MP 4500
+      NRG MP 5000
+      NRG MP 5000B
+      NRG MP 5500
+      NRG MP 6500
+      NRG MP 7500
+      NRG MP 9000
+      Ricoh Aficio 220
+      Ricoh Aficio 1022
+      Ricoh Aficio 1027
+      Ricoh Aficio 1032
+      Ricoh Aficio 1035
+      Ricoh Aficio 1045
+      Ricoh Aficio 1060
+      Ricoh Aficio 1075
+      Ricoh Aficio 1515
+      Ricoh Aficio 2015
+      Ricoh Aficio 2016
+      Ricoh Aficio 2018
+      Ricoh Aficio 2018D
+      Ricoh Aficio 2020
+      Ricoh Aficio 2020D
+      Ricoh Aficio 2022
+      Ricoh Aficio 2027
+      Ricoh Aficio 2032
+      Ricoh Aficio 2035
+      Ricoh Aficio 2035e
+      Ricoh Aficio 2045
+      Ricoh Aficio 2045e
+      Ricoh Aficio 2051
+      Ricoh Aficio 2060
+      Ricoh Aficio 2075
+      Ricoh Aficio 2090
+      Ricoh Aficio 2105
+      Ricoh Aficio 3025
+      Ricoh Aficio 3030
+      Ricoh Aficio 3035
+      Ricoh Aficio 3045
+      Ricoh Aficio MP 161
+      Ricoh Aficio MP 1100
+      Ricoh Aficio MP 1350
+      Ricoh Aficio MP 1600
+      Ricoh Aficio MP 2000
+      Ricoh Aficio MP 2500
+      Ricoh Aficio MP 2510
+      Ricoh Aficio MP 2550
+      Ricoh Aficio MP 2550B
+      Ricoh Aficio MP 3010
+      Ricoh Aficio MP 3350
+      Ricoh Aficio MP 3350B
+      Ricoh Aficio MP 3500
+      Ricoh Aficio MP 4000
+      Ricoh Aficio MP 4000B
+      Ricoh Aficio MP 4500
+      Ricoh Aficio MP 5000
+      Ricoh Aficio MP 5000B
+      Ricoh Aficio MP 5500
+      Ricoh Aficio MP 6500
+      Ricoh Aficio MP 7500
+      Ricoh Aficio MP 9000
+      Samsung ML-1250
+      Samsung ML-1450
+      Samsung ML-1450PS
+      Samsung ML-1650
+      Samsung ML-1651N
+      Samsung ML-1750
+      Samsung ML-2150
+      Samsung ML-2150PS
+      Samsung ML-2151N
+      Samsung ML-2151NPS
+      Samsung ML-2152W
+      Samsung ML-2152WPS
+      Samsung ML-2250
+      Samsung ML-2550
+      Samsung ML-2551N
+      Samsung ML-2552W
+      Samsung ML-7300
+      Samsung ML-7300N
+      Savin 2235
+      Savin 2245
+      Savin 2522
+      Savin 2527
+      Savin 2532
+      Savin 2535
+      Savin 2545
+      Savin 2560
+      Savin 2575
+      Savin 3515
+      Savin 40105
+      Savin 4015
+      Savin 4018
+      Savin 4018d
+      Savin 4022
+      Savin 4027
+      Savin 4035
+      Savin 4035e
+      Savin 4045
+      Savin 4045e
+      Savin 4051
+      Savin 4060
+      Savin 4075
+      Savin 4090
+      Savin 4135eG
+      Savin 4135g
+      Savin 4145eG
+      Savin 4145g
+      Savin 7025
+      Savin 8016
+      Savin 8020
+      Savin 8020d
+      Savin 8025
+      Savin 8025e
+      Savin 8030
+      Savin 8030e
+      Savin 8035
+      Savin 8035e
+      Savin 8035g
+      Savin 8045
+      Savin 8045e
+      Savin 8045g
+      Savin 8055
+      Savin 8065
+      Savin 8075
+      Savin 8090
+      Savin 8110
+      Savin 8135
+      Savin 816
+      Savin 9016
+      Savin 9021d
+      Savin 9025
+      Savin 9025b
+      Savin 9033
+      Savin 9033b
+      Savin 9040
+      Savin 9040b
+      Savin 9050
+      Savin 9050b
+      Sharp AR-M257
+      Xerox WorkCentre M118
 
 
 ================================================================
 
-III) EXCEPTIONS AND WORKAROUNDS
+V) EXCEPTIONS AND WORKAROUNDS
 
 A) GENERAL ISSUES
 
   1) The Canon, Hewlett-Packard, Lexmark, and dye sublimation drivers
      do not offer all of the additional options and improvements that
      the Epson driver does.  Please contact us if you would like to
-     assist with this.
+     assist with making these options available (requires C
+     programming skills).
 
 
 ----------------
@@ -603,150 +1432,10 @@ B) BUILD/INSTALLATION ISSUES
 
      iii) Edit cups-config to remove the reference to the run path.
 
-  2) There is a known translation problem building the PPD files used
-     by the CUPS driver such that on many systems all of the PPD
-     files are in the English language.  This causes CUPS tools, such
-     as KUPS or http://localhost:631 to display many copies of each
-     PPD file, all in the English (en) language.  In fact, the PPD
-     files should be translated into many different languages.
-
-     The PPD files are created by a program named "genppd" in the
-     src/cups directory.  This program is called once for each
-     language, and creates all of the PPD files for the language in
-     one shot.
-
-     The command 'zgrep' can be used to determine if genppd is
-     creating the PPD files correctly, as follows:
-
-	 src/cups$ zgrep LanguageVersion ppd/*/pcl-4.ppd.gz
-	 ppd/C/pcl-4.ppd.gz:*LanguageVersion: English
-	 ppd/da/pcl-4.ppd.gz:*LanguageVersion: Danish
-	 ppd/en_GB/pcl-4.ppd.gz:*LanguageVersion: English-GB
-	 ...
-
-     If the PPD file for each language has a different language
-     version, the genppd program operated correctly.  If instead the
-     output looks like this:
-
-	 src/cups$ zgrep LanguageVersion ppd/*/stp-pcl-4.5.1.ppd.gz
-	 ppd/C/stp-pcl-4.5.1.ppd.gz:*LanguageVersion: English
-	 ppd/da/stp-pcl-4.5.1.ppd.gz:*LanguageVersion: English
-	 ppd/en_GB/stp-pcl-4.5.1.ppd.gz:*LanguageVersion: English
-	 ...
-
-     the program did not operate correctly.
-
-     If you do not have 'zgrep' on your system, you can gunzip the
-     PPD files, and use
-
-	 grep LanguageVersion ppd/*/stp-pcl-4.5.1.ppd
-
-     to accomplish the same test.
-
-     The normal mechanism for performing translations is to set the
-     LANG environment variable to the appropriate language prior to
-     running the program.  This normally causes the program to search
-     the translations (normally in /usr/share/locale or
-     /usr/lib/locale) for the chosen language.  When a specially
-     marked string is used, a special macro calls `gettext()' on the
-     string to retrieve the translation, and substitutes the
-     translation for the string in question.
-
-     There are two problems with this approach in the context of
-     genppd.  The translation engine is intended to be used after
-     installation, not during build, and this causes problems.
-
-     i) At the time genppd is run, the translations have not been
-	installed in the normal system directories.  Fortunately,
-	it's possible to tell the translation machinery (via
-	bindtextdomain) to look elsewhere for the translation
-	catalogs.  What we do is install the catalogs in a temporary
-	directory under src/cups, and tell genppd to instruct the
-	translation machinery to look there.  This workaround is
-	straightforward, and doesn't normally cause problems.
-
-     ii) LANG only lets us pick a valid locale (normally determined by
-	listing the directories in /usr/share/locale or
-	/usr/lib/locale).  Unfortunately, while language codes (which
-	form the base of locales) are standard, the actual locale
-	names aren't always.  On some systems, the locale names are
-	just the language base names; on others, they are the
-	language names concatenated with country codes (e. g. en_US),
-	while on others they are language codes concatenated with
-	character sets.  We are not aware of any workaround for this,
-	possibly short of actually running make install and then
-	rebuilding the PPD's.  'make install' will install the
-	message catalogs, and that may create the necessary locale
-	directories.  This is not exactly a very elegant approach.
-
-     The GNU gettext library (libintl.a) provides another environment
-     variable, LANGUAGE, which unconditionally looks up translations
-     according to the language, ignoring LANG and the LC_*
-     environment variables that are normally used for translation.
-     This library is no longer included with Gutenprint
-     (--with-included-gettext will not work).  Install the GNU
-     gettext package first if you need libintl.a.  Many systems
-     provide translation machinery in their standard libraries, and
-     it may not always be best to use foreign libraries to replace
-     standard system functionality.
-
-     We have chosen to use LANGUAGE for this purpose, as the GNU
-     gettext library appears to offer the most reliable translation,
-     and LANGUAGE appears to offer the most reliable mechanism.  We
-     have actually found that LANG and LC_* can interfere with
-     LANGUAGE, thus we do not use both.
-
-     To determine if the translations are working, you must actually
-     inspect the PPD files.  You will need to
-
-     cd src/cups/ppd/sv
-     gunzip *
-     more *
-
-     or the like to determine if this is successful.  In particular,
-     look for LanguageVersion, and make sure that it is correct (it
-     should be "Swedish" in the sv directory, for example), and also
-     make sure that the paper sizes are also translated.  We
-     currently suggest using the Swedish translation for this purpose
-     as it is the most complete.
-
-     If packagers find that the PPD files are all in English, rather
-     than translated into the appropriate languages, we suggest the
-     following:
-
-     i) Install GNU gettext (libintl).  If your system is not based
-	on GNU libc (Linux usually is based on GNU libc; BSD,
-	Solaris, IRIX, etc. are not), you will need this to have any
-	possibility of creating the translated PPD files.
-
-     ii) Run 'make install' to install the package (including the
-	message catalogs) onto the system first, and then do the
-	following:
-
-	cd src/cups
-	rm ppd-stamp
-	make
-
-	to rebuild the PPD files.  Having the message catalogs on the
-	system may permit this to succeed.
-
-     iii) Ensure that your system actually has locales named 'sv',
-	'pl', and all of the other supported languages, and change
-	LANGUAGE to something more appropriate (most likely LANG,
-	LC_MESSAGES, or LC_ALL).
-
-     iv) Build the PPD files on a Linux-based system; they are
-	portable.
-
-     v) Use --disable-translated-cups-ppds on the configure command line
-	to suppress the translated PPD files altogether.
-
-     Please feel free to contact us about this issue.
-
-  3) There are multiple issues that one must be aware of when using
+  2) There are multiple issues that one must be aware of when using
      Foomatic with Gutenprint.
 
-     i) Before installing any new release of Gutenprint 5.1, you must
+     i) Before installing any new release of Gutenprint 5.2, you must
 	manually remove any existing Foomatic option files.  This is
 	because the Foomatic utility to load data kits
 	(foomatic-kitload) does not remove obsolete data files from
@@ -803,18 +1492,18 @@ B) BUILD/INSTALLATION ISSUES
 
      iii) The Foomatic data is version locked to the Gutenprint release
 	installed on the system.  For example, PPD files generated
-	with the Foomatic data for release 5.1.0 will not work with
-	the ijsgutenprint in release 5.1.1.  This is to prevent
+	with the Foomatic data for release 5.2.0 will not work with
+	the ijsgutenprint in release 5.2.1.  This is to prevent
 	accidentally using incorrect data, which could cause incorrect
 	function to take place.
 
-  4) There is a known complication building "escputil" that causes
-     problems on some systems.  "escputil" uses the "readline"
-     package, to support command editing and history within the
-     program.  Unfortunately, linking programs with "readline" often
-     requires linking against additional libraries, and the exact
-     library depends upon the system (e. g. not all Linux systems have
-     the same requirements).
+  3) There is a known complication building "escputil" that causes
+     problems on a small number of systems.  "escputil" uses the
+     "readline" package, to support command editing and history within
+     the program.  Unfortunately, linking programs with "readline"
+     often requires linking against additional libraries, and the
+     exact library depends upon the system (e. g. not all Linux/UNIX
+     systems have the same requirements).
 
      The configure script attempts to determine which additional
      library must be linked against.  It tries using the following
diff --git a/README b/README
index 6dda7b8..174a80f 100644
--- a/README
+++ b/README
@@ -1,26 +1,25 @@
-Welcome to Gutenprint 5.2.0-beta2!  Please read these notes carefully.
+Welcome to Gutenprint 5.2.1!  Please read these notes carefully.
 
-*** NOTE TO PACKAGERS: This is a beta release of the forthcoming 5.2
-    stable release.  As of 5.2 and until further notice, Gutenprint
-    will no longer deliver separate "development" and "stable" release
-    series.
+*** NOTE TO PACKAGERS: Please read the file README.package for issues
+    that are of interest to distributors and packagers of Gutenprint.
+    It is not necessary for end users of Gutenprint to read this file.
 
 ================================================================
 
 I) INTRODUCTION
 
-    This is Gutenprint version 5.2.0-beta2, a beta 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 provide high quality printing for UNIX (including
-    Macintosh OS X 10.2 and newer) and Linux systems in many cases
-    equal to or better than proprietary vendor-supplied drivers.
-    Gutenprint also includes an enhanced print plug-in for the GIMP
-    image editor, replacing the Gimp-Print 4.2-based plugin supplied
-    with GIMP 1.2, 2.0, and 2.2, and offering an alternative with
-    additional capabilities to the GtkPrint-based plugin supplied with
-    GIMP 2.4 and beyond.
+    This is Gutenprint version 5.2.1, the first 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
+    provide high quality printing for UNIX (including Macintosh OS X
+    10.3 and newer) and Linux systems in many cases equal to or better
+    than proprietary vendor-supplied drivers.  Gutenprint also
+    includes an enhanced print plug-in for the GIMP image editor,
+    replacing the Gimp-Print 4.2-based plugin supplied with GIMP 1.2,
+    2.0, and 2.2, and offering an alternative with additional
+    capabilities to the GtkPrint-based plugin supplied with GIMP 2.4
+    and beyond.
 
     Gutenprint has been renamed in order to clearly distinguish it
     from GIMP.  While this package started out as the Print plugin for
@@ -36,7 +35,7 @@ I) INTRODUCTION
     information than this README file.  The user's manual contains a
     complete list of supported printers.  In addition, please read the
     release notes (NEWS), as it has information on the latest changes.
-    This package has changed extensively since Gimp-Print 4.2.
+    This package has changed significantly since Gutenprint 5.0.
 
     Gutenprint supports only the printer part of multi-function
     devices (devices that typically include scanning, copying, and fax
@@ -69,8 +68,9 @@ II) INSTALLATION
     administration skills along with superuser privileges.  Superuser
     privilege allows you to perform actions that may be damaging to
     your system.  If you are not comfortable with the material
-    discussed here and in the release notes, we recommend that you not
-    attempt to install this package from source.
+    discussed here and in the release notes, or with performing simple
+    administrative actions, we recommend that you not attempt to
+    install this package from source.
 
     Before beginning, please read the release notes carefully for any
     updates.
@@ -120,7 +120,7 @@ A) OVERVIEW
 	gimp-print-devel@lists.sourceforge.net
 
 	================================================================
-	  Release: gutenprint 5.1.98.1 generated on 12 Apr 2008
+	  Release: gutenprint 5.2.1 generated on 18 Oct 2008
 
 	  Features:
 	    Build CUPS:                                 yes, installing in /usr
@@ -138,15 +138,15 @@ A) OVERVIEW
 	    Build test programs:                        yes
 	    Build testpattern generator:                yes
 
-	Installation summary:
+	  Installation summary:
 	    Installation prefix:                        /usr/local
 	    Data directory:                             /usr/local/share/gutenprint
 	    Library directory:                          /usr/local/lib/gutenprint
-	    XML data directory:                         /usr/local/share/gutenprint/5.1/xml
-	    Module directory:                           /usr/local/lib/gutenprint/5.1/modules
+	    XML data directory:                         /usr/local/share/gutenprint/5.2/xml
+	    Module directory:                           /usr/local/lib/gutenprint/5.2/modules
 	    Install sample images:                      yes
 
-	General configuration:
+	  General configuration:
 	    Compiler options:                           -Disfinite=finite  -O6  -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls
 	    Build static libraries:                     yes
 	    Build shared libraries:                     no
@@ -156,6 +156,7 @@ A) OVERVIEW
 	    Generate debugging symbols:                 no
 	    Use modules:                                static
 	    Use readline libraries:                     yes, extra arguments: -lncurses
+	    uname -a output:                            Linux linuxhome 2.6.25.11-0.1-default #1 SMP 2008-07-13 20:48:28 +0200 x86_64 x86_64 x86_64 GNU/Linux
 	================================================================
 
     The CUPS, GIMP, Foomatic, and Ghostscript components require that
@@ -190,27 +191,10 @@ B) CORE DRIVER LIBRARY
     statically (with no use of shared libraries), you may use the
     option --disable-shared.
 
-    NOTES TO PACKAGERS: 
-
-    * You may wish to create a development package containing header
-      files and linkable libraries separate from the runtime package.
-      There are a few third party applications that link against
-      Gutenprint.
-
-    * Gutenprint permits installation of Gimp-Print 4.2 and Gutenprint
-      5.0 alongside Gutenprint 5.2, and in the future will permit
-      concurrent installation of different stable versions of
-      Gutenprint with different minor version numbers.  Therefore, you
-      should consider allowing Gutenprint 5.0, Gutenprint 5.2, and
-      Gimp-Print 4.2 to be installed concurrently.
-
-    * The core driver library component also includes locale files for
-      the libary and documentation.
-
 
 ----------------
 
-B) CUPS
+C) CUPS
 
     Gutenprint may be used as a driver under CUPS (Common UNIX
     Printing System), if your system uses that spooler.  Full
@@ -237,6 +221,13 @@ B) CUPS
     with your ability to continue using the Gutenprint 5.0 or
     Gimp-Print 4.2 CUPS driver.
 
+    WARNING: The "canon" and "epson" CUPS backends that previously
+    were distributed with Gutenprint are no longer distributed, so you
+    will need to ensure that none of your printer queues use these
+    backends.  Please read the Critical Upgrade Note in the release
+    notes for more information and the procedure for modifying your
+    printer queues.
+
     The Gutenprint CUPS driver consists of the following components:
 
     * The core Gutenprint CUPS driver, rastertogutenprint.5.2.  This
@@ -244,12 +235,9 @@ B) CUPS
       printer-specific data.  This is most commonly installed in
       /usr/lib/cups/filter.
 
-    * Back ends for driving Canon and Epson printers, named "canon"
-      and "epson".  These provide the ability to get information from
-      the printer for CUPS to use, and are normally installed in
-      /usr/lib/cups/backend.  Additional utilities to send certain
-      commands to these printers are installed as commandtocanon and
-      commandtoepson; they are installed in /usr/lib/cups/filter.
+    * Additional utilities to send certain commands to these printers
+      are installed as commandtocanon and commandtoepson; they are
+      installed in /usr/lib/cups/filter.
 
     * One or more sets of PPD files describing all of the printers
       supported by Gutenprint.  These are normally installed in
@@ -265,8 +253,9 @@ B) CUPS
     * A utility to update PPD files from an earlier release of
       Gutenprint, cups-genppdupdate.  This utility may be used to
       update PPD files generated by earlier versions of Gutenprint
-      starting from 4.3.21.  This is normally installed in /usr/sbin.
-      This utility cannot update PPD files from Gimp-Print 4.2.
+      starting from 4.3.21, including any 5.0, 5.1, or 5.2 release or
+      pre-release.  This is normally installed in /usr/sbin.  This
+      utility cannot update PPD files from Gimp-Print 4.2.
 
     * A utility to generate PPD files, cups-genppd.5.2.  Normally this
       is only required when the package is built, and only with CUPS
@@ -280,7 +269,7 @@ B) CUPS
       Gutenprint-supported printers, cups-calibrate.  This is normally
       installed in /usr/bin.
 
-    WARNING: With certain versions of CUPS and in certain non-default
+    WARNING: With certain versions of CUPS and in certain non-standard
 	configurations, if a new version of Gutenprint is installed
 	over an existing version genppd will create PPD files based on
 	the older version of Gutenprint rather than the newer version.
@@ -305,12 +294,17 @@ B) CUPS
 	   vendors typically install Gutenprint in /usr.
 
 	iii) Gutenprint is built dynamically only (--disable-static or
-	   --disable-static-genppd).  This is not a default, and
+	   --disable-static-genppd).  This is not standard, and
 	   requires the explicit --disable-static or
 	   --disable-static-genppd on the Gutenprint "configure"
 	   command line.  Therefore, if you build Gutenprint normally
 	   you should not be vulnerable to this problem.
 
+	iv) Gutenprint is configured to build the PPD files at compile
+	   time.  This is the case when using CUPS 1.1, but is not the
+	   case when using CUPS 1.2 unless you explicitly use
+	   --enable-cups-ppds.
+
 	Note that in general if you install CUPS into a non-standard
 	location, and install Gutenprint into the same location, this
 	problem can surface.  For example, if you choose to install
@@ -358,9 +352,10 @@ B) CUPS
     Following installation of the package with "make install", you
     must restart CUPS to permit CUPS to see the new PPD files.  The
     exact command to restart CUPS varies; it is typically something
-    like /etc/init.d/cups, /etc/software/init.d/cups, /etc/rc.d/cups,
-    /usr/sbin/rccups, or even /etc/rc.d/init.d/cups.  Your system may
-    have a different way to restart the CUPS server.  OS X, for
+    like /etc/init.d/cups restart, /etc/software/init.d/cups restart,
+    /etc/rc.d/cups restart, /usr/sbin/rccups, or even
+    /etc/rc.d/init.d/cups restart.  Your system may have a different
+    way to restart the CUPS server.  OS X (10.3, 10.4, and 10.5), for
     example, uses the following command:
 
     sudo /System/Library/StartupItems/PrintingServices/PrintingServices.sh restart
@@ -368,19 +363,36 @@ B) CUPS
     You may optionally choose to update your existing PPD files using
     the command cups-genppdupdate, after which you should restart CUPS
     as described above.  We strongly recommend use of this update
-    procedure.  This script will automatically update Gutenprint PPD
-    files from earlier versions.  This script will only update PPD
-    files from earlier versions of Gutenprint; it will not update
-    Gimp-Print 4.2 PPD files.  However, you may install Gutenprint 5.2
-    alongside Gimp-Print 4.2, and use both Gimp-Print 4.2 and
-    Gutenprint 5.2 drivers concurrently in separate printer queues.
-    Therefore, you need not convert a workflow based on Gimp-Print 4.2
-    right away, but can gradually convert or even permanently use both
-    drivers for different printer queues.
+    procedure, which is fast and simple.  This script will
+    automatically update Gutenprint PPD files from earlier versions
+    (5.0, 5.1, or 5.2 release or prerelease).  This script will only
+    update PPD files from earlier versions of Gutenprint; it will not
+    update Gimp-Print 4.2 PPD files or PPD files from other drivers.
+    However, you may install Gutenprint 5.2 alongside Gimp-Print 4.2,
+    and use both Gimp-Print 4.2 and Gutenprint 5.2 drivers
+    concurrently in separate printer queues.  Therefore, you need not
+    convert a workflow based on Gimp-Print 4.2 right away, but can
+    gradually convert or even permanently use both drivers for
+    different printer queues.
 
     The following options to configure are available for compiling the
     Gutenprint driver for CUPS:
 
+    --enable-cups-ppds
+
+	With CUPS 1.2, it is possible to arrange for PPD files to be
+	generated when a new printer queue is generated rather than
+	having all pre-generated PPD files in the filesystem.  This
+	saves considerable disk space and avoids the possible build
+	problem described above.  Normally, Gutenprint detects which
+	version of CUPS is in use and configures itself to create the
+	PPD files at build time only when CUPS 1.1 is in use.
+
+	If you wish to generate the PPD files at build time, you may
+	use this option.  If you are running CUPS 1.1, and for some
+	reason do not wish to generate the PPD files, you may use
+	--disable-cups-ppds.
+
     --disable-translated-cups-ppds
 
 	By default, PPD files for all languages available in
@@ -394,6 +406,19 @@ B) CUPS
 	--disable-translated-cups-ppds to avoid having many duplicate
 	PPD files.
 
+    --disable-globalized-cups-ppds
+
+	Starting with Gutenprint 5.2, Gutenprint builds PPD files
+	containing translations for all languages if CUPS 1.2 or above
+	is in use.  This greatly reduces the number of PPD files
+	created or PPD file choices offered.
+
+	If you have problems with the globalized PPD files, you may
+	use this option to generate standard translated PPD files (or
+	English-only, if --disable-translated-cups-ppds is also in
+	use).  This option only has effect if --enable-cups-ppds is
+	used.
+
     --enable-simplified-cups-ppds
 
 	Gutenprint 5.2 offers an option of creating simplified PPD
@@ -433,24 +458,10 @@ B) CUPS
 	this option unless you are certain that you understand the
 	problem and how to work around it.
 
-    NOTES TO PACKAGERS: 
-
-    * We recommend that your installation package run
-      cups-genppdupdate and restart CUPS as part of the installation
-      process.
-
-    * All files and directories with versioned names
-      (e. g. rastertogutenprint and the PPD files) may be installed
-      concurrently with other versions of Gimp-Print and Gutenprint as
-      described above.  Other executables (such as the Canon and Epson
-      back ends, and cups-calibrate) are not versioned, but are not
-      linked against libgutenprint and do not have any other
-      dependencies on Gutenprint.
-
 
 ----------------
 
-C) FOOMATIC
+D) FOOMATIC
 
     Foomatic is a printer meta-driver that can be used with any
     spooler (CUPS, lpd, LPRng, etc.) or even no spooler at all.  It
@@ -465,12 +476,15 @@ C) FOOMATIC
     repository for all printer information; the tools provided on
     those systems will not recognize the CUPS PPD files.  If your
     system uses Foomatic in this way, or does not use CUPS, you should
-    use Foomatic to manage your printers.
+    use Foomatic to manage your printers.  If you are using CUPS,
+    however, we strongly recommend using the CUPS driver described in
+    the previous section in preference to Foomatic.
 
     The Gutenprint driver for Foomatic requires Foomatic 2.0 or
     higher; Foomatic 3.0 or above is highly recommended.  It also
     requires GNU Ghostscript 6.53 or newer, AFPL Ghostscript 7.04 or
-    newer, or ESP Ghostscript 7.05 or newer for IJS support.
+    newer, or ESP Ghostscript 7.05 or newer for IJS support.  We
+    recommend Ghostscript 8 or above.
 
     The Foomatic support in Gutenprint consists of a data generator
     and an IJS-based Ghostscript driver.  It is possible to use the
@@ -484,21 +498,17 @@ C) FOOMATIC
     The Ghostscript driver in Gutenprint 5.2 is based on the IJS
     protocol.  IJS is a protocol originally developed by
     Hewlett-Packard to allow new drivers to be used with Ghostscript
-    without having to be compiled into Ghostscript.  As this driver
-    runs in a separate process, and IJS is licensed in a way
-    compatible with the GPL, this driver may be used with AFPL
-    Ghostscript if desired.  We no longer offer the legacy "stp"
-    driver provided in Gimp-Print 4.2.  This driver was difficult to
-    maintain and required a complex procedure to integrate with
-    Ghostscript.
+    without having to be compiled into Ghostscript.
 
     Gutenprint 5.2 offers two Foomatic drivers, one supporting the
     full range of options and the other supporting simplified options,
     as describe above under CUPS.  The full-featured driver is named
     "gutenprint-ijs.5.2"; the simplified driver is named
-    "gutenprint-ijs-simplified.5.2".  This allows Gutenprint 5.2 to
-    coexist with Gimp-Print 4.2; both drivers may be installed and
-    used (on separate printer queues, of course) on the same system.
+    "gutenprint-ijs-simplified.5.2".
+
+    Gutenprint 5.2 may coexist with Gimp-Print 4.2; both drivers may
+    be installed and used (on separate printer queues, of course) on
+    the same system.
 
     Normally, the Gutenprint configure script will automatically
     detect the presence of Foomatic and Ghostscript on your system.
@@ -530,14 +540,12 @@ C) FOOMATIC
 
 ----------------
 
-D) GIMP
+E) GIMP
 
-    Gutenprint may be used with an enhanced Print plug-in for GIMP
-    (2.0 and above), providing the ability to print images.  Please
-    read the release notes in addition to this README, as there have
-    been some changes in procedure since Gimp-Print 4.2 if you are
-    using certain versions of GIMP.  Gutenprint 5.2 no longer supports
-    GIMP 1.2.
+    Gutenprint may be used as an enhanced Print plug-in for GIMP (2.0
+    and above), providing the ability to print images.  Please read
+    the release notes in addition to this README.  Gutenprint 5.2 no
+    longer supports GIMP 1.2.
 
     The enhanced Print plugin for GIMP replaces the Gimp-Print
     4.2-based plugin provided with GIMP 2.0 and 2.2.  As of the GIMP
@@ -550,7 +558,7 @@ D) GIMP
 
     If your system separates development packages from runtime
     packages, you will typically have to install development packages
-    for GIMP itself, in addition to GTK and glib.  With GIMP 2.x and
+    for GIMP itself, in addition to Gtk and Glib.  With GIMP 2.x and
     GTK 2.x, additional packages may be required.
 
     Normally, the Gutenprint configure script detects which version,
@@ -565,24 +573,17 @@ D) GIMP
 
     ./configure --enable-user-install
 
-    It is not possible for Gimp-Print 4.2 and Gutenprint 5.2 (or any
-    future release) to coexist in the same installation of GIMP.  The
-    Gutenprint 5.2-based plugin can read settings from previous
-    versions of Gimp-Print, but the configuration file format in
-    Gutenprint 5.2 cannot be read by older versions of Gimp-Print.
-
-    NOTE TO PACKAGERS:
-
-    * The enhanced GIMP plugin, unlike the core library and the
-      Foomatic and CUPS drivers, may not be installed concurrently
-      with other versions.  For example, you may not install both the
-      Gimp-Print 4.2 and the Gutenprint 5.2 version of the Print
-      plugin, as they use different configuration file formats.
+    It is not possible for Gimp-Print 4.2, Gutenprint 5.0, and
+    Gutenprint 5.2 (or any future release) to coexist in the same
+    installation of GIMP.  The Gutenprint 5.2-based plugin can read
+    settings from previous versions of Gimp-Print, but the
+    configuration file format in Gutenprint 5.2 cannot be read by
+    older versions of Gimp-Print or Gutenprint.
 
 
 ----------------
 
-E) ESCPUTIL
+F) ESCPUTIL
 
     "escputil" is a command line utility for administering Epson
     inkjet printers.  It performs head alignment, retrieval of ink
@@ -598,12 +599,6 @@ E) ESCPUTIL
     notes.  If you do not wish to use readline, you may use
     --without-readline.
 
-    Unlike the case in Gimp-Print 4.2, this utility is not standalone;
-    it requires the installation of the core Gutenprint package to
-    function.  This allows it to support new printers without
-    modification.
-
-
 
 ================================================================
 
@@ -633,10 +628,10 @@ 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 Foomatic/gutenprint-ijs.5.2
-    Epson Stylus Photo R300 Foomatic/gutenprint-ijs-simplified.5.2
     Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.0
     Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.0 Simplified
+    Epson Stylus Photo R300 Foomatic/gutenprint-ijs.5.2
+    Epson Stylus Photo R300 Foomatic/gutenprint-ijs-simplified.5.2
 
     The "simplified" PPD files offer a basic set of options only, for
     selecting printer options, standard paper sizes, and basic quality
@@ -648,7 +643,10 @@ A) PRINTER INSTALLATION
     CUPS+Gutenprint and Foomatic/gutenprint-ijs PPD files.  While
     either kind of PPD file will work, we recommend using the
     CUPS+Gutenprint PPD files.  These PPD files can be automatically
-    updated with cups-genppdupdate.
+    updated with cups-genppdupdate when you later upgrade your
+    Gutenprint installation.  Some systems mark the Foomatic PPD files
+    as "(recommended)"; we nevertheless recommend using the
+    CUPS+Gutenprint PPD files.
 
     Other PPD files are described differently, such as
 
@@ -660,18 +658,18 @@ A) PRINTER INSTALLATION
     NOTES FOR CUPS USERS:
 
     If you do not choose to automatically update existing PPD files,
-    you should reinstall any printers that you are using Gutenprint
-    PPD files with.  The Gutenprint driver and the PPD files must be
-    kept in sync, since the PPD files reflect the particular version
-    of the driver that they were built against.  If you attempt to use
-    a version of Gutenprint with PPD files not built for that precise
-    version, the driver will fail with a diagnostic error message.
-    For example, PPD files built for Gutenprint 5.0.0-beta4 will not
-    work with driver version 5.0.0.  You can identify printers using
-    Gutenprint PPD files by the name of the PPD file, which will be
-    something like:
-
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.2.0(en)
+    you should reinstall any printer queues that you are using
+    Gutenprint PPD files with.  The Gutenprint driver and the PPD
+    files must be kept in sync, since the PPD files reflect the
+    particular version of the driver that they were built against.  If
+    you attempt to use a version of Gutenprint with PPD files not
+    built for that precise version, the driver will fail with a
+    diagnostic error message.  For example, PPD files built for
+    Gutenprint 5.2.0-beta4 will not work with driver version 5.2.1.
+    You can identify printers using Gutenprint PPD files by the name
+    of the PPD file, which will be something like:
+
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.2.1(en)
 
     Linux users please note: If you are using CUPS 1.1.11 or higher,
     and you have a USB-connected printer, you must have a printer
@@ -726,7 +724,8 @@ IV) SOLVING PROBLEMS
        may be located elsewhere on some systems) for lines starting
        with 'E' (these lines indicate errors).  Also search for log
        information produced by Gutenprint; all such output lines will
-       have "Gutenprint".  These lines may help you solve the problem.
+       contain "Gutenprint".  These lines may help you solve the
+       problem and will help us investigate your problem if necessary.
 
     6) If you are using CUPS, enable debugging output.  This can be
        done by editing /etc/cups/cupsd.conf (which must be done as
diff --git a/README.package b/README.package
new file mode 100644
index 0000000..8deb7fc
--- /dev/null
+++ b/README.package
@@ -0,0 +1,258 @@
+This file describes issues that packagers and distributors of
+Gutenprint should be aware of.  This information is targeted at Linux
+distributions and others who deliver Gutenprint packages intended for
+end-user use.
+
+1) As of 5.2 and until further notice, Gutenprint will no longer
+   deliver separate "development" and "stable" release series.
+
+   The point release will be advanced between beta/RC releases and
+   stable releases.  The first stable release of 5.2 will be numbered
+   5.2.1; the betas and release candidates will be numbered
+   5.2.0-betaN or 5.2.0-rcN.  Any betas for the next stable release
+   will be numbered 5.2.2-betaN; the next stable release will be
+   numbered 5.2.3 (if there are beta or release candidate builds) or
+   5.2.2 (if there are not).
+
+   This ensures that the highest numbered release is always the most
+   current, and that there will be no confusion between beta releases
+   and stable releases.  Our experience with 5.0 was that many users
+   continued to use beta releases of 5.0 even after 5.0.0 was
+   released, and worse, in some cases referred to the 5.0.0-beta2
+   release (for example) as "5.0.2".  We believe that the numbering
+   scheme described above will avoid that problem.
+
+2) We request that you subscribe to
+   gimp-print-devel@lists.sourceforge.net to get the latest
+   information about upcoming changes.
+
+3) If you intend to make any changes or patches to the source code of
+   this package, we request that you inform us of these changes and
+   discuss them with us prior to distribution, and identify a point of
+   contact to us.
+
+   While this is not required by the GPL, we would greatly appreciate
+   knowing about any changes you plan to make for three reasons:
+
+   * The changes may benefit all users of Gutenprint.
+
+   * We may have already considered this kind of change in the past
+     and elected not to make it, or may be planning to make this kind
+     of change in a different way from what you have done.
+     Coordination in this case may save everyone a lot of work.
+
+   * If we receive bug reports or support requests from users of your
+     package, we will either know who we can direct them to or will
+     have a better understanding of what is different in your package
+     that may cause observed differences from what we expect.
+
+4) We specifically request that you *not* make changes to the margins
+   of any paper size in src/xml/papers.xml, or in general change
+   papers.xml other than to add additional paper sizes.  In the past,
+   a number of distributions have imposed margins for certain paper
+   sizes in this file because printing on certain printers was cut off
+   (cropped).  Change to papers.xml to work around these problems is
+   not an appropriate workaround for this problem, as it results in
+   *all* printers being bound by those margins.  Furthermore, the
+   margin problem has since been fixed in a different way.  Margins
+   should only be listed in papers.xml for papers that intrinsically
+   have margins of their own, such as photo papers with tear-off
+   margins.
+
+   Historically, in Gutenprint 5.0.0 all printers that offered
+   different margins under different circumstances (e. g. a choice
+   between normal margins and full-bleed printing, such as many Epson
+   inkjet printers, or different margins for certain paper sizes, such
+   as many laser printers that offer different margins for A4 than for
+   other paper sizes) always listed the wide margins in the PPD files,
+   and if the full bleed option was not selected (or a paper size that
+   required narrower margins was), the printed image was simply
+   clipped to the margins.  This preserved the image dimension on the
+   page, but in some cases resulted in parts of the image being
+   clipped.  The workaround that some packagers applied, to add
+   margins in papers.xml, made it impossible to print full bleed to
+   these paper sizes even on printers capable of this.  None of these
+   packagers ever discussed this change with us, and as a result we
+   were caught by surprise by some bug reports that it took us a while
+   to track down.
+
+   This issue was fixed in 5.0.1 (in the native CUPS driver) by means
+   of a new PPD option to allow users to either shrink the image to
+   the appropriate margins or to crop the image.  This allows users to
+   select whether they prefer dimensional accuracy or printing the
+   entire image.  However, we have observed that this workaround has
+   still not been removed from all distributors' packages.
+
+   At this point, there should be no reason to specify margins in
+   papers.xml for any reason other than adding a media size that has
+   intrinsic margins of its own, such as a new paper with tear-off
+   margins.  If you think you need to do this for any other reason,
+   please discuss it with us first!
+
+5) Packaging the Core Library (libgutenprint)
+
+   * You may wish to create a development package containing header
+     files and linkable libraries separate from the runtime package.
+     There are a few third party applications that link against
+     Gutenprint.
+
+   * Gutenprint permits installation of Gimp-Print 4.2 and Gutenprint
+     5.0 alongside Gutenprint 5.2, and in the future will permit
+     concurrent installation of different stable versions of
+     Gutenprint with different minor version numbers.  Therefore, you
+     may consider allowing Gutenprint 5.0, Gutenprint 5.2, and
+     Gimp-Print 4.2 to be installed concurrently.
+
+   * The core driver library component also includes XML data files
+     (in src/xml), locale files for the libary, and documentation.
+     The XML data files in src/xml are mandatory; the driver will not
+     function without these files.
+
+   * We do not recommend installing any program linked against
+     libgutenprint with enhanced privileges (via the setuid or setgid
+     mechanism, or any other such mechanism).  We have not audited
+     libgutenprint for safety in this kind of environment, and changes
+     in Gutenprint 5.2 (in particular, moving the Epson driver data
+     into external data files whose root can be changed by means of
+     the environment variable STP_DATA_PATH) may increase risk.
+     Furthermore, if you build the Gutenprint library in modular
+     fashion, such that drivers may be dynamically loaded into running
+     applications, there is an additional hazard in the form of an
+     environment variable that allows specifying where those modules
+     should be loaded from (STP_MODULE_PATH).
+
+     The only program in the core Gutenprint package that has any
+     reason to be installed this way is escputil, because it needs to
+     talk directly to the printer.  See the discussion of escputil
+     below.
+
+6) Packaging the CUPS Driver
+
+   * IMPORTANT: As a special part of the install/upgrade procedure,
+     your installer should check for any queues using the "epson" or
+     "canon" backends and convert them to use an appropriate standard
+     backend, usually the "usb" or "parallel" backend.  Please see the
+     Critical Upgrade Note in the release notes (NEWS file) for more
+     information.
+
+     Note that the epson and canon backends are no longer distributed
+     by Gutenprint, so your installer will have to fix this up in any
+     event.
+
+   * We recommend that your installation package run cups-genppdupdate
+     and restart CUPS as part of the installation process.  This will
+     copy changes made by the user and ensure that the user has
+     correct PPD files.  The CUPS driver will refuse to use a PPD file
+     built with a different version of Gutenprint.
+
+   * Some applications do not translate PPD file contents (option
+     names and values) when globalized PPD files are used (see the
+     release notes for general discussion of globalized PPD files).
+     At the time these notes are being written, we have determined
+     that versions of OpenOffice.org up to and including 3.0.0-rc1 do
+     not translate PPD file contents with globalized PPD files, but
+     language-specific localized PPD files are translated correctly.
+     We have also determined that GIMP 2.4, using the GtkPrint plugin,
+     does not translate PPD contents using globalized PPD files, but
+     does with single language files.
+
+     The CUPS development team has informed us that they have not
+     received complaints from users about this, despite the fact that
+     the basic set of PPD files distributed by CUPS is globalized.
+     Unlike Gutenprint, however, CUPS does not require that its PPD
+     files be upgraded with each release, so users upgrading from
+     older versions of CUPS may not be exposed to this issue.
+
+     Gutenprint does provide a way to upgrade PPD files to
+     language-specific ones, using the -l option to
+     cups-genppdupdate.  PPD files that are being upgraded from a
+     previous release of Gutenprint may be upgraded with
+     cups-genppdupdate -loriginal to update to the original language.
+     Note that this works even if the PPD files have been updated to
+     globalized files, since cups-genppdupdate stores the language of
+     the PPD file it was upgrading.  cups-genppdupdate -l<language>
+     updates PPD files into the specified language; see the release
+     notes or user's manual for the set of languages supported.
+
+     Note that -loriginal will *not* work with PPD files that had been
+     upgraded with Gutenprint 5.2.0-beta4, since cups-genppdupdate in
+     that release does not preserve the original language of the PPD
+     file.
+
+     Distributions have a number of possible options to address this
+     issue, for example:
+
+     - Use globalized PPD files and accept the translation problem or
+       fix the applications that do not translate the PPD files
+       correctly.  You may wish to document the procedure of using
+       cups-genppdupdate to generate language-specific PPD files in
+       this case.
+
+     - Configure Gutenprint with --disable-globalized-cups-ppds, to
+       generate only single-language PPD files.
+
+     - Provide an administrative utility to update either individual
+       PPD files or all PPD files on the system.  If you provide this
+       kind of utility, we recommend using the -l<language> option
+       rather than -loriginal.
+
+   * All files and directories with versioned names (such as
+     rastertogutenprint and the PPD files) may be installed and used
+     concurrently with other versions of Gimp-Print and Gutenprint as
+     described above.  Other executables (such as cups-calibrate) are
+     not versioned, but are not linked against libgutenprint and do
+     not have any other dependencies on Gutenprint.
+
+7) Packaging the IJS Driver and Foomatic Data
+
+   * We recommend packaging the IJS driver
+     (/usr/bin/ijsgutenprint.5.2) and its man page
+     (/usr/man/man1/ijsgutenprint.1.gz) together with the Foomatic
+     data.
+
+   * If your distribution uses CUPS as its print spooler, we very
+     strongly recommend using the native CUPS driver rather than
+     Foomatic.  The native CUPS driver has been better tested than the
+     IJS driver, and has more complete solutions for some issues
+     involving paper dimensions and presentation of numerical
+     options.  The native CUPS driver also has better management tools
+     (cups-genppdupdate, specifically).
+
+     If you wish to improve the IJS driver and Foomatic data, please
+     contact us.
+
+   * The IJS driver and the Foomatic data kit and PPD files are
+     versioned (major and minor), and hence you may consider
+     permitting multiple versions to be installed concurrently.  The
+     man page (/usr/man/man1/ijsgutenprint.1.gz) is not versioned, but
+     the interface to this command, which is intended only to be
+     invoked from within Ghostscript, is not likely to change.
+
+8) Packaging the Enhanced Print Plugin for GIMP
+
+   * The enhanced Print plugin for GIMP, unlike the core library and
+     the Foomatic and CUPS drivers, may not be installed concurrently
+     with other versions.  For example, you may not install both the
+     Gimp-Print 4.2 and the Gutenprint 5.2 version of the Print
+     plugin, as they use different configuration file formats.
+
+9) Packaging the Epson Inkjet Management Utility, escputil
+
+   * We do not recommend installing this utility with enhanced
+     privileges (via the setuid or setgid mechanism, or any other such
+     mechanism) without a careful security audit on your part.  If
+     elevated privileges are required in your installation, we suggest
+     ensuring that the variables STP_DATA_PATH and STP_MODULE_PATH be
+     cleared prior to invoking escputil (or that you patch escputil to
+     clear those variables prior to calling stp_init()) and otherwise
+     using the least privilege required to allow escputil to run.
+     Another option may be to allow (by means of device permissions)
+     an appropriate group of users to run this command.
+
+     With the conversion of the Epson driver to using external data
+     files in XML format rather than data hard-coded into the library
+     binary, there are more opportunities for injection of bad data
+     into the driver.
+
+     Note that the default configuration of Gutenprint does not
+     install escputil with elevated privileges.
diff --git a/aclocal.m4 b/aclocal.m4
index d7f1202..5fafa26 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,14 +11,17 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -208,6 +210,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -287,9 +291,80 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -614,7 +689,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -707,7 +786,7 @@ AC_CACHE_CHECK([$1], [$2],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -978,7 +1057,7 @@ else
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -986,7 +1065,7 @@ else
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1303,7 +1382,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1824,6 +1903,13 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2323,7 +2409,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2759,7 +2845,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2816,6 +2902,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2925,7 +3012,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -2938,7 +3025,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -3084,51 +3171,23 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
@@ -3379,7 +3438,7 @@ case $host_os in
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3814,7 +3873,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
 # objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
 dnl not a library.  It's possible we should let each
@@ -3939,6 +3999,11 @@ fi
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
@@ -3995,7 +4060,6 @@ solaris*)
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -4080,7 +4144,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4257,6 +4321,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4319,7 +4384,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4556,6 +4621,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4905,7 +4974,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4962,7 +5031,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4999,7 +5069,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -5095,7 +5165,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5246,7 +5316,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5316,7 +5387,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5453,7 +5525,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -5477,7 +5549,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5493,7 +5565,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5512,6 +5584,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5542,12 +5615,14 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5597,7 +5672,7 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5816,7 +5891,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -5836,7 +5911,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -5996,11 +6071,10 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -6737,7 +6811,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6752,7 +6826,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -6768,8 +6842,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -7064,7 +7140,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -7124,13 +7200,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -7235,16 +7311,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -7617,7 +7694,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
@@ -7723,6 +7800,8 @@ m4_include([m4/isc-posix.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
 m4_include([m4/progtest.m4])
 m4_include([m4/stp.m4])
 m4_include([m4/stp_cups.m4])
diff --git a/config.h.in b/config.h.in
index 54cb95f..e5f1151 100644
--- a/config.h.in
+++ b/config.h.in
@@ -19,6 +19,14 @@
 /* */
 #undef GUTENPRINT_RELEASE_VERSION
 
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
diff --git a/configure b/configure
index de9cde8..5e11bc1 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.180 .
+# From configure.ac Revision: 1.205 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gutenprint 5.1.98.2.
+# Generated by GNU Autoconf 2.61 for gutenprint 5.2.1.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
@@ -746,8 +746,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.1.98.2'
-PACKAGE_STRING='gutenprint 5.1.98.2'
+PACKAGE_VERSION='5.2.1'
+PACKAGE_STRING='gutenprint 5.2.1'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -787,6 +787,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
+gt_needs=
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -888,6 +889,8 @@ LN_S
 ECHO
 AR
 RANLIB
+DSYMUTIL
+NMEDIT
 CPP
 CXX
 CXXFLAGS
@@ -905,6 +908,23 @@ MAINTAINER_MODE_TRUE
 MAINTAINER_MODE_FALSE
 MAINT
 CUPS_CONFIG
+USE_NLS
+MSGFMT
+GMSGFMT
+MSGFMT_015
+GMSGFMT_015
+XGETTEXT
+XGETTEXT_015
+MSGMERGE
+INTL_MACOSX_LIBS
+LIBICONV
+LTLIBICONV
+INTLLIBS
+LIBINTL
+LTLIBINTL
+POSUB
+USE_NLS_TRUE
+USE_NLS_FALSE
 FOOMATIC_CONFIGURE
 FOOMATIC_PPDFILE
 IJS_CONFIG
@@ -934,18 +954,6 @@ DB2HTML
 DOXYGEN
 DIALOG
 FOOMATIC_KITLOAD
-MKINSTALLDIRS
-MSGFMT
-GMSGFMT
-XGETTEXT
-MSGMERGE
-USE_NLS
-LIBICONV
-LTLIBICONV
-INTLLIBS
-LIBINTL
-LTLIBINTL
-POSUB
 GNUCFLAGS
 BUILD_FOOMATIC_TRUE
 BUILD_FOOMATIC_FALSE
@@ -963,6 +971,8 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE
 CUPS_PPDS_AT_TOP_LEVEL_FALSE
 BUILD_TRANSLATED_CUPS_PPDS_TRUE
 BUILD_TRANSLATED_CUPS_PPDS_FALSE
+BUILD_GLOBALIZED_CUPS_PPDS_TRUE
+BUILD_GLOBALIZED_CUPS_PPDS_FALSE
 BUILD_SIMPLIFIED_CUPS_PPDS_TRUE
 BUILD_SIMPLIFIED_CUPS_PPDS_FALSE
 USE_LEVEL3_PS_TRUE
@@ -983,8 +993,6 @@ INSTALL_SAMPLES_TRUE
 INSTALL_SAMPLES_FALSE
 INSTALL_USER_GUIDE_TRUE
 INSTALL_USER_GUIDE_FALSE
-USE_NLS_TRUE
-USE_NLS_FALSE
 BUILD_MODULES_TRUE
 BUILD_MODULES_FALSE
 BUILD_GENPPD_STATIC_TRUE
@@ -1551,7 +1559,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.1.98.2 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1621,7 +1629,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.1.98.2:";;
+     short | recursive ) echo "Configuration of gutenprint 5.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1637,11 +1645,16 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
+  --enable-nls-macosx     build CUPS PPD files [(automatic)]
   --enable-cups-ppds      build CUPS PPD files [(automatic)]
   --enable-cups-1_2-enhancements
                           build CUPS 1.2 enhancements [(automatic)]
   --enable-translated-cups-ppds
-                          build translated CUPS PPD files [yes]
+                          build translated CUPS PPD files [(automatic)]
+  --enable-globalized-cups-ppds
+                          build globalized CUPS PPD files [(automatic)]
   --enable-simplified-cups-ppds
                           build simplified CUPS PPD files (options: yes, no,
                           only) [no]
@@ -1663,8 +1676,6 @@ Optional Features:
   --enable-test           build test programs [yes]
   --enable-testpattern    build testpattern generator [(automatic)]
   --enable-user-install   install GIMP plugin in home directory [no]
-  --disable-rpath         do not hardcode runtime library paths
-  --disable-nls           do not use Native Language Support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1675,6 +1686,11 @@ Optional Packages:
   --with-tags[=TAGS]      include additional configurations [automatic]
   --with-cups=PREFIX      whether to build CUPS driver (default PREFIX=/usr)
                           [(automatic)]
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
+  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+  --without-libintl-prefix     don't search for libintl in includedir and libdir
   --with-foomatic         build foomatic data files [(automatic)]
   --with-foomatic3        make use of foomatic 3 extra features [(automatic)]
   --with-ghostscript      build Ghostscript driver [(automatic)]
@@ -1687,11 +1703,9 @@ Optional Packages:
                           name GIMP 2.x Print plugin gutenprint (requires GIMP
                           2.2; normally used with GIMP 2.4 or above)
                           [(automatic)]
-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
-  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
-  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-  --with-libintl-prefix=DIR  search for libintl in DIR/include and DIR/lib
-  --without-libintl-prefix     don't search for libintl in includedir and libdir
+  --with-cups-nickname="nickname suffix"
+                          Suffix to add to PPD NickName, default=" - CUPS+Gutenprint v"
+  --with-archflags="..."  additional options for CFLAGS and LDFLAGS
 
 Some influential environment variables:
   CC          C compiler command
@@ -1783,7 +1797,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.1.98.2
+gutenprint configure 5.2.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1814,7 +1828,7 @@ 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.1.98.2, which was
+It was created by gutenprint $as_me 5.2.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2087,6 +2101,7 @@ echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+gt_needs="$gt_needs "
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2205,13 +2220,13 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 GUTENPRINT_MAJOR_VERSION=5
-GUTENPRINT_MINOR_VERSION=1
-GUTENPRINT_MICRO_VERSION=98
-GUTENPRINT_EXTRA_VERSION=.2
+GUTENPRINT_MINOR_VERSION=2
+GUTENPRINT_MICRO_VERSION=1
+GUTENPRINT_EXTRA_VERSION=
 GUTENPRINT_CURRENT_INTERFACE=2
-GUTENPRINT_INTERFACE_AGE=0
+GUTENPRINT_INTERFACE_AGE=3
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.1.98.2
+GUTENPRINT_VERSION=5.2.1
 GUTENPRINTUI2_CURRENT_INTERFACE=1
 GUTENPRINTUI2_INTERFACE_AGE=0
 GUTENPRINTUI2_BINARY_AGE=0
@@ -2549,7 +2564,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.1.98.2'
+ VERSION='5.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4480,7 +4495,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4696,7 +4711,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4699 "configure"' > conftest.$ac_ext
+  echo '#line 4714 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4868,7 +4883,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -6470,7 +6489,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
 # find the maximum length of command line arguments
 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -6785,7 +6803,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -7345,6 +7363,318 @@ fi
   ;;
 esac
 
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+
 enable_dlopen=yes
 enable_win32_dll=no
 
@@ -7410,7 +7740,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 
@@ -7438,11 +7768,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7441: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7771: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7445: \$? = $ac_status" >&5
+   echo "$as_me:7775: \$? = $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.
@@ -7712,10 +8042,10 @@ if test -n "$lt_prog_compiler_pic"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works=no
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -7728,27 +8058,27 @@ 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:7731: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7735: \$? = $ac_status" >&5
+   echo "$as_me:8065: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -7775,10 +8105,10 @@ esac
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -7791,20 +8121,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
@@ -7832,11 +8162,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7835: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8165: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7839: \$? = $ac_status" >&5
+   echo "$as_me:8169: \$? = $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
@@ -7916,12 +8246,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -7980,7 +8311,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -8199,7 +8530,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -8219,7 +8550,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -8491,11 +8822,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -9015,7 +9345,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9537,6 +9867,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -9856,7 +10201,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   { echo "$as_me:$LINENO: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -10132,7 +10477,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -10181,7 +10526,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10184 "configure"
+#line 10529 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10281,7 +10626,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10284 "configure"
+#line 10629 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10408,7 +10753,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -10464,6 +10809,7 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
+    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -10524,7 +10870,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -10760,6 +11106,10 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -11008,6 +11358,7 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -11045,7 +11396,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -11252,7 +11603,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -11265,7 +11616,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -11523,51 +11874,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       archive_cmds_need_lc_CXX=no
       hardcode_direct_CXX=no
       hardcode_automatic_CXX=yes
       hardcode_shlibpath_var_CXX=unsupported
       whole_archive_flag_spec_CXX=''
       link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
@@ -11818,7 +12141,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -12225,7 +12548,6 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
-
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -12327,6 +12649,11 @@ fi
 
 $rm -f confest.$objext
 
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 case $host_os in
 interix[3-9]*)
@@ -12382,7 +12709,6 @@ solaris*)
   ;;
 esac
 
-
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -12458,7 +12784,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -12554,7 +12880,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -12685,10 +13011,10 @@ if test -n "$lt_prog_compiler_pic_CXX"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_CXX=no
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -12701,27 +13027,27 @@ 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:12704: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13030: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12708: \$? = $ac_status" >&5
+   echo "$as_me:13034: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -12748,10 +13074,10 @@ esac
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -12764,20 +13090,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -12805,11 +13131,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12808: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13134: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12812: \$? = $ac_status" >&5
+   echo "$as_me:13138: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12862,7 +13188,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -12881,6 +13207,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
@@ -12982,7 +13309,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13503,6 +13830,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -13586,6 +13928,7 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -13834,6 +14177,10 @@ predeps=$lt_predeps_CXX
 # shared library.
 postdeps=$lt_postdeps_CXX
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -14048,7 +14395,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -14086,7 +14433,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -14351,10 +14698,10 @@ if test -n "$lt_prog_compiler_pic_F77"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_F77=no
+  lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
@@ -14367,27 +14714,27 @@ 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:14370: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14717: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14374: \$? = $ac_status" >&5
+   echo "$as_me:14721: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
+       lt_cv_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -14414,10 +14761,10 @@ esac
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_F77=no
+  lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -14430,20 +14777,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
+         lt_cv_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_prog_compiler_static_works_F77=yes
+       lt_cv_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -14471,11 +14818,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14474: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14821: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14478: \$? = $ac_status" >&5
+   echo "$as_me:14825: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14555,12 +14902,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -14619,7 +14967,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -14838,7 +15186,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -14858,7 +15206,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -15110,11 +15458,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -15583,7 +15930,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16104,6 +16451,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -16187,6 +16549,7 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -16435,6 +16798,10 @@ predeps=$lt_predeps_F77
 # shared library.
 postdeps=$lt_postdeps_F77
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -16609,7 +16976,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -16658,11 +17025,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16661: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17028: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16665: \$? = $ac_status" >&5
+   echo "$as_me:17032: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16722,7 +17089,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     darwin* | rhapsody*)
@@ -16792,7 +17159,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -16932,10 +17299,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; then
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_GCJ=no
+  lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
@@ -16948,27 +17315,27 @@ 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:16951: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17318: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16955: \$? = $ac_status" >&5
+   echo "$as_me:17322: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
+       lt_cv_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -16995,10 +17362,10 @@ esac
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_GCJ=no
+  lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -17011,20 +17378,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
+         lt_cv_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_prog_compiler_static_works_GCJ=yes
+       lt_cv_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
@@ -17052,11 +17419,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17055: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17422: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17059: \$? = $ac_status" >&5
+   echo "$as_me:17426: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17136,12 +17503,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -17200,7 +17568,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -17419,7 +17787,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -17439,7 +17807,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -17711,11 +18079,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -18184,7 +18551,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18705,6 +19072,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -18788,6 +19170,7 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -19036,6 +19419,10 @@ predeps=$lt_predeps_GCJ
 # shared library.
 postdeps=$lt_postdeps_GCJ
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -19209,7 +19596,7 @@ ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -19269,6 +19656,7 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -19517,6 +19905,10 @@ predeps=$lt_predeps_RC
 # shared library.
 postdeps=$lt_postdeps_RC
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -19847,12 +20239,1962 @@ if test -z "${BUILD_CUPS}" ; then
 fi
 
 
+
+
+  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
+
+
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case "$MSGFMT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+    ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+    case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case "$XGETTEXT" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+    ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+    rm -f messages.po
+
+    case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case "$MSGMERGE" in
+  [\\/]* | ?:[\\/]*)
+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH; do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&5
+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+    ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+        test -n "$localedir" || localedir='${datadir}/locale'
+
+
+  ac_config_commands="$ac_config_commands po-directories"
+
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+else
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+fi
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac
+fi
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+
+fi
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval=$enable_rpath; :
+else
+  enable_rpath=yes
+fi
+
+
+
+                  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+  withval=$with_libiconv_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+
+fi
+
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='iconv '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+              else
+                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
+if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
+_ACEOF
+
+  fi
+    { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
+if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_func_CFLocaleCopyCurrent=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CFLOCALECOPYCURRENT 1
+_ACEOF
+
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+
+
+
+
+
+
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+    case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
+    if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+
+
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='[
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+]'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$gt_func_gnugettext_libc=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$gt_func_gnugettext_libc=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
+
+
+
+
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+  { echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+if test "${am_cv_func_iconv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  am_cv_func_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV 1
+_ACEOF
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6; }
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then
+  withval=$with_libintl_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+
+fi
+
+      LIBINTL=
+  LTLIBINTL=
+  INCINTL=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='intl '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$hardcode_direct" = yes; then
+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+              else
+                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBINTL; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+    done
+  fi
+
+          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$gt_func_gnugettext_libintl=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$gt_func_gnugettext_libintl=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+                        if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);
+int
+main ()
+{
+bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"
+fi
+ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+        fi
+
+                                        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+                    LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+                LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_NLS 1
+_ACEOF
+
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  { echo "$as_me:$LINENO: checking whether to use NLS" >&5
+echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
+  if test "$USE_NLS" = "yes"; then
+    { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    { echo "$as_me:$LINENO: result: $gt_source" >&5
+echo "${ECHO_T}$gt_source" >&6; }
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
+        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
+echo "${ECHO_T}$LIBINTL" >&6; }
+
+  for element in $INCINTL; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+      fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETTEXT 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DCGETTEXT 1
+_ACEOF
+
+    fi
+
+        POSUB=po
+  fi
+
+
+
+    INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+ if test x${USE_NLS} = xyes; then
+  USE_NLS_TRUE=
+  USE_NLS_FALSE='#'
+else
+  USE_NLS_TRUE='#'
+  USE_NLS_FALSE=
+fi
+
+
+# create custom command-line --enable option
+{ echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
+echo $ECHO_N "checking whether to build CUPS PPD files... $ECHO_C" >&6; }
+# Check whether --enable-nls-macosx was given.
+if test "${enable_nls_macosx+set}" = set; then
+  enableval=$enable_nls_macosx; case "${enableval}" in
+
+                yes) USE_NLS_OSX="yes" ; { echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
+echo "${ECHO_T}${USE_NLS_OSX}" >&6; } ;;
+                no) USE_NLS_OSX="no" ; { echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
+echo "${ECHO_T}${USE_NLS_OSX}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
+                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nls-macosx" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-nls-macosx" >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+	    esac
+else
+  if test -z "${USE_NLS_OSX}" ; then
+               USE_NLS_OSX="(automatic)"
+             fi
+             { echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
+echo "${ECHO_T}${USE_NLS_OSX}" >&6; } ;
+fi
+
+if test -z "${USE_NLS_OSX}" ; then
+  USE_NLS_OSX="(automatic)"
+fi
+
+
 USE_LEVEL3_PS=no
 BUILD_CUPS_PPDS="${BUILD_CUPS}"
-BUILD_TRANSLATED_CUPS_PPDS="${BUILD_CUPS}"
+BUILD_TRANSLATED_CUPS_PPDS=no
 BUILD_CUPS_1_2="no"
 if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
-  cups_version=`${CUPS_CONFIG} --version`
+  cups_version=`${CUPS_CONFIG} --version | sed -e '1,$s/svn$/.0/'`
   cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`
   cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`
   cups_point=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\3/'`
@@ -19927,6 +22269,10 @@ if test -z "${BUILD_CUPS_1_2}" ; then
 fi
 
 
+if test "$USE_NLS" != no -a "$BUILD_CUPS_PPDS" = yes ; then
+   BUILD_TRANSLATED_CUPS_PPDS="yes"
+fi
+
 # create custom command-line --enable option
 { echo "$as_me:$LINENO: checking whether to build translated CUPS PPD files" >&5
 echo $ECHO_N "checking whether to build translated CUPS PPD files... $ECHO_C" >&6; }
@@ -19947,14 +22293,51 @@ echo "$as_me: error: bad value ${enableval} for --enable-translated-cups-ppds" >
 	    esac
 else
   if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
-               BUILD_TRANSLATED_CUPS_PPDS="yes"
+               BUILD_TRANSLATED_CUPS_PPDS="(automatic)"
              fi
              { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
 echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;
 fi
 
 if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
-  BUILD_TRANSLATED_CUPS_PPDS="yes"
+  BUILD_TRANSLATED_CUPS_PPDS="(automatic)"
+fi
+
+
+if test "$BUILD_CUPS_1_2" = yes -a "$BUILD_TRANSLATED_CUPS_PPDS" = yes ; then
+   BUILD_GLOBALIZED_CUPS_PPDS=yes
+else
+   BUILD_GLOBALIZED_CUPS_PPDS=no
+fi
+
+# create custom command-line --enable option
+{ echo "$as_me:$LINENO: checking whether to build globalized CUPS PPD files" >&5
+echo $ECHO_N "checking whether to build globalized CUPS PPD files... $ECHO_C" >&6; }
+# Check whether --enable-globalized-cups-ppds was given.
+if test "${enable_globalized_cups_ppds+set}" = set; then
+  enableval=$enable_globalized_cups_ppds; case "${enableval}" in
+
+                yes) BUILD_GLOBALIZED_CUPS_PPDS="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
+                no) BUILD_GLOBALIZED_CUPS_PPDS="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
+                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-globalized-cups-ppds" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-globalized-cups-ppds" >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+	    esac
+else
+  if test -z "${BUILD_GLOBALIZED_CUPS_PPDS}" ; then
+               BUILD_GLOBALIZED_CUPS_PPDS="(automatic)"
+             fi
+             { echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;
+fi
+
+if test -z "${BUILD_GLOBALIZED_CUPS_PPDS}" ; then
+  BUILD_GLOBALIZED_CUPS_PPDS="(automatic)"
 fi
 
 
@@ -21058,6 +23441,165 @@ fi
 
 
 
+
+
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+  { echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+if test "${am_cv_func_iconv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  am_cv_func_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV 1
+_ACEOF
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6; }
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+
         { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
@@ -23881,1574 +26423,6 @@ echo "$as_me: error: Cannot find ijs-config; please ensure Ghostscript 6.53 or a
   IJS_LIBS=`$IJS_CONFIG --libs`
 fi
 
-
-
-        MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-
-
-
-
-
-        # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
-        # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-    rm -f messages.po
-
-    # Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGMERGE" in
-  /*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-	ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-  ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-      if test "$GMSGFMT" != ":"; then
-            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-      GMSGFMT=":"
-    fi
-  fi
-
-      if test "$XGETTEXT" != ":"; then
-            if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
-      XGETTEXT=":"
-    fi
-        rm -f messages.po
-  fi
-
-  ac_config_commands="$ac_config_commands default-1"
-
-
-
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-fi
-if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi
-fi
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
-if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-
-fi
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-    # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval=$enable_rpath; :
-else
-  enable_rpath=yes
-fi
-
-
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
-  withval=$with_libiconv_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-
-fi
-
-      LIBICONV=
-  LTLIBICONV=
-  INCICONV=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='iconv '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$hardcode_direct" = yes; then
-                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
-              else
-                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBICONV; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
-                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
-            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
-    done
-  fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
-
-
-
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-    if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-
-
-
-
-
-
-        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  gt_cv_func_gnugettext1_libc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_gnugettext1_libc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
-
-        if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-
-
-
-
-
-          am_save_CPPFLAGS="$CPPFLAGS"
-
-  for element in $INCICONV; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
-if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
-    fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
-  if test "$am_cv_func_iconv" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
-
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
-  else
-            CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-
-
-
-
-
-
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
-  withval=$with_libintl_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-
-fi
-
-      LIBINTL=
-  LTLIBINTL=
-  INCINTL=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='intl '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
-          else
-                                    :
-          fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$hardcode_direct" = yes; then
-                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                                                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
-              else
-                                                LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBINTL; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
-                    LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
-            LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
-    done
-  fi
-
-          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
-if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();
-int
-main ()
-{
-bindtextdomain ("", "");
-return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  gt_cv_func_gnugettext1_libintl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_gnugettext1_libintl=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-                        if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();
-int
-main ()
-{
-bindtextdomain ("", "");
-return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext1_libintl=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
-fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
-        fi
-
-                                        if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-                    LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
-
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
-        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6; }
-
-  for element in $INCINTL; do
-    haveit=
-    for x in $CPPFLAGS; do
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
-
-      fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
-
-    fi
-
-        POSUB=po
-  fi
-
-
-
-    INTLLIBS="$LIBINTL"
-
-
-
-
-
-
-
 GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_MAJOR_VERSION}.${GUTENPRINT_MINOR_VERSION}
 
 
@@ -29770,7 +30744,7 @@ else
 fi
 
 
- if test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes; then
+ if test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes ; then
   BUILD_TRANSLATED_CUPS_PPDS_TRUE=
   BUILD_TRANSLATED_CUPS_PPDS_FALSE='#'
 else
@@ -29779,6 +30753,15 @@ else
 fi
 
 
+ if test x${BUILD_GLOBALIZED_CUPS_PPDS} = xyes ; then
+  BUILD_GLOBALIZED_CUPS_PPDS_TRUE=
+  BUILD_GLOBALIZED_CUPS_PPDS_FALSE='#'
+else
+  BUILD_GLOBALIZED_CUPS_PPDS_TRUE='#'
+  BUILD_GLOBALIZED_CUPS_PPDS_FALSE=
+fi
+
+
  if test x${BUILD_SIMPLIFIED_CUPS_PPDS} = xyes; then
   BUILD_SIMPLIFIED_CUPS_PPDS_TRUE=
   BUILD_SIMPLIFIED_CUPS_PPDS_FALSE='#'
@@ -29928,15 +30911,6 @@ else
 fi
 
 
- if test x${USE_NLS} = xyes; then
-  USE_NLS_TRUE=
-  USE_NLS_FALSE='#'
-else
-  USE_NLS_TRUE='#'
-  USE_NLS_FALSE=
-fi
-
-
 # loadable modules
 # portable sh has no AND test...
 if test -n "$HAVE_LTDL_H"; then
@@ -30047,9 +31021,18 @@ _ACEOF
 fi
 
 
+# Check whether --with-cups_nickname was given.
+if test "${with_cups_nickname+set}" = set; then
+  withval=$with_cups_nickname; CUPS_PPD_NICKNAME_STRING="$withval"
+else
+  CUPS_PPD_NICKNAME_STRING=" - CUPS+Gutenprint v"
+fi
+
+
+
 
 cat >>confdefs.h <<_ACEOF
-#define CUPS_PPD_NICKNAME_STRING " - CUPS+Gutenprint v"
+#define CUPS_PPD_NICKNAME_STRING "$CUPS_PPD_NICKNAME_STRING"
 _ACEOF
 
 
@@ -30059,7 +31042,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="27 Apr 2008"
+RELEASE_DATE="19 Oct 2008"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -30110,6 +31093,14 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
 
 
+# Check whether --with-archflags was given.
+if test "${with_archflags+set}" = set; then
+  withval=$with_archflags; CFLAGS="$CFLAGS $withval"
+    LDFLAGS="$LDFLAGS $withval"
+fi
+
+
+
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files doc/Makefile"
@@ -30148,6 +31139,8 @@ ac_config_files="$ac_config_files src/Makefile"
 
 ac_config_files="$ac_config_files src/cups/Makefile"
 
+ac_config_files="$ac_config_files src/cups/Info.plist"
+
 ac_config_files="$ac_config_files src/cups/cups-genppdupdate"
 
 ac_config_files="$ac_config_files src/escputil/Makefile"
@@ -30172,6 +31165,24 @@ ac_config_files="$ac_config_files src/main/Makefile"
 
 ac_config_files="$ac_config_files src/main/gutenprint.pc"
 
+ac_config_files="$ac_config_files src/xml/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/media/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/mediasizes/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/model/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/inputslots/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/inks/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/weaves/Makefile"
+
+ac_config_files="$ac_config_files src/xml/escp2/qualitypresets/Makefile"
+
 ac_config_files="$ac_config_files src/gutenprintui2/Makefile"
 
 ac_config_files="$ac_config_files src/gutenprintui2/gutenprintui2.pc"
@@ -30307,6 +31318,13 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_NLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_NLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30377,6 +31395,13 @@ echo "$as_me: error: conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never define
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_GLOBALIZED_CUPS_PPDS_TRUE}" && test -z "${BUILD_GLOBALIZED_CUPS_PPDS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_TRUE}" && test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30447,13 +31472,6 @@ echo "$as_me: error: conditional \"INSTALL_USER_GUIDE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_NLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_NLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${BUILD_MODULES_TRUE}" && test -z "${BUILD_MODULES_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30772,7 +31790,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gutenprint $as_me 5.1.98.2, which was
+This file was extended by gutenprint $as_me 5.2.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30825,7 +31843,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.1.98.2
+gutenprint config.status 5.2.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -30931,9 +31949,9 @@ cat >>$CONFIG_STATUS <<_ACEOF
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
 
@@ -30950,7 +31968,7 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/gutenprint.dox") CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
@@ -30970,6 +31988,7 @@ do
     "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/cups/Makefile") CONFIG_FILES="$CONFIG_FILES src/cups/Makefile" ;;
+    "src/cups/Info.plist") CONFIG_FILES="$CONFIG_FILES src/cups/Info.plist" ;;
     "src/cups/cups-genppdupdate") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdupdate" ;;
     "src/escputil/Makefile") CONFIG_FILES="$CONFIG_FILES src/escputil/Makefile" ;;
     "src/foomatic/Makefile") CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;;
@@ -30982,6 +32001,15 @@ do
     "src/gimp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp2/Makefile" ;;
     "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
     "src/main/gutenprint.pc") CONFIG_FILES="$CONFIG_FILES src/main/gutenprint.pc" ;;
+    "src/xml/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/Makefile" ;;
+    "src/xml/escp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/Makefile" ;;
+    "src/xml/escp2/media/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/media/Makefile" ;;
+    "src/xml/escp2/mediasizes/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/mediasizes/Makefile" ;;
+    "src/xml/escp2/model/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/model/Makefile" ;;
+    "src/xml/escp2/inputslots/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/inputslots/Makefile" ;;
+    "src/xml/escp2/inks/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/inks/Makefile" ;;
+    "src/xml/escp2/weaves/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/weaves/Makefile" ;;
+    "src/xml/escp2/qualitypresets/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/escp2/qualitypresets/Makefile" ;;
     "src/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/Makefile" ;;
     "src/gutenprintui2/gutenprintui2.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/gutenprintui2.pc" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
@@ -31191,6 +32219,8 @@ LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
 CPP!$CPP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
@@ -31208,6 +32238,23 @@ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
 MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
 MAINT!$MAINT$ac_delim
 CUPS_CONFIG!$CUPS_CONFIG$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+MSGFMT_015!$MSGFMT_015$ac_delim
+GMSGFMT_015!$GMSGFMT_015$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+XGETTEXT_015!$XGETTEXT_015$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
+LIBICONV!$LIBICONV$ac_delim
+LTLIBICONV!$LTLIBICONV$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+LIBINTL!$LIBINTL$ac_delim
+LTLIBINTL!$LTLIBINTL$ac_delim
+POSUB!$POSUB$ac_delim
+USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim
+USE_NLS_FALSE!$USE_NLS_FALSE$ac_delim
 FOOMATIC_CONFIGURE!$FOOMATIC_CONFIGURE$ac_delim
 FOOMATIC_PPDFILE!$FOOMATIC_PPDFILE$ac_delim
 IJS_CONFIG!$IJS_CONFIG$ac_delim
@@ -31237,18 +32284,6 @@ DB2HTML!$DB2HTML$ac_delim
 DOXYGEN!$DOXYGEN$ac_delim
 DIALOG!$DIALOG$ac_delim
 FOOMATIC_KITLOAD!$FOOMATIC_KITLOAD$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
-LTLIBINTL!$LTLIBINTL$ac_delim
-POSUB!$POSUB$ac_delim
 GNUCFLAGS!$GNUCFLAGS$ac_delim
 BUILD_FOOMATIC_TRUE!$BUILD_FOOMATIC_TRUE$ac_delim
 BUILD_FOOMATIC_FALSE!$BUILD_FOOMATIC_FALSE$ac_delim
@@ -31266,6 +32301,8 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE!$CUPS_PPDS_AT_TOP_LEVEL_TRUE$ac_delim
 CUPS_PPDS_AT_TOP_LEVEL_FALSE!$CUPS_PPDS_AT_TOP_LEVEL_FALSE$ac_delim
 BUILD_TRANSLATED_CUPS_PPDS_TRUE!$BUILD_TRANSLATED_CUPS_PPDS_TRUE$ac_delim
 BUILD_TRANSLATED_CUPS_PPDS_FALSE!$BUILD_TRANSLATED_CUPS_PPDS_FALSE$ac_delim
+BUILD_GLOBALIZED_CUPS_PPDS_TRUE!$BUILD_GLOBALIZED_CUPS_PPDS_TRUE$ac_delim
+BUILD_GLOBALIZED_CUPS_PPDS_FALSE!$BUILD_GLOBALIZED_CUPS_PPDS_FALSE$ac_delim
 BUILD_SIMPLIFIED_CUPS_PPDS_TRUE!$BUILD_SIMPLIFIED_CUPS_PPDS_TRUE$ac_delim
 BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim
 USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim
@@ -31275,15 +32312,6 @@ BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim
 BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
 BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
 BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim
-BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim
-BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim
-BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim
-BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim
-BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim
-BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim
-BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim
-INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim
-INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -31325,10 +32353,17 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim
+BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim
+BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim
+BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim
+BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim
+BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim
+BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim
+INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim
+INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim
 INSTALL_USER_GUIDE_TRUE!$INSTALL_USER_GUIDE_TRUE$ac_delim
 INSTALL_USER_GUIDE_FALSE!$INSTALL_USER_GUIDE_FALSE$ac_delim
-USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim
-USE_NLS_FALSE!$USE_NLS_FALSE$ac_delim
 BUILD_MODULES_TRUE!$BUILD_MODULES_TRUE$ac_delim
 BUILD_MODULES_FALSE!$BUILD_MODULES_FALSE$ac_delim
 BUILD_GENPPD_STATIC_TRUE!$BUILD_GENPPD_STATIC_TRUE$ac_delim
@@ -31372,7 +32407,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTALLOCA!$LTALLOCA$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -31773,21 +32808,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -31824,7 +32860,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -31938,7 +32974,7 @@ echo "$as_me: error: cannot create directory $as_dir" >&2;}
   done
 done
  ;;
-    "default-1":C)
+    "po-directories":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -31958,35 +32994,52 @@ done
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
           cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
           # parameters.
           if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
             # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
           case "$ac_given_srcdir" in
             .) srcdirpre= ;;
             *) srcdirpre='$(srcdir)/' ;;
           esac
           POFILES=
-          GMOFILES=
           UPDATEPOFILES=
           DUMMYPOFILES=
+          GMOFILES=
           for lang in $ALL_LINGUAS; do
             POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
             UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
             DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
           done
           # CATALOGS depends on both $ac_dir and the user's LINGUAS
           # environment variable.
@@ -32021,7 +33074,7 @@ done
             done
           fi
           test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
           for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
             if test -f "$f"; then
               case "$f" in
@@ -32093,6 +33146,7 @@ if test "$BUILD_CUPS" != "no" ; then
     echo "        Build CUPS PPD files:                   $BUILD_CUPS_PPDS"
     if test "$BUILD_CUPS_PPDS" != "no" ; then
 	echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
+	echo "                Build global CUPS PPD files:    $BUILD_GLOBALIZED_CUPS_PPDS"
 	echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
 	echo "            Install CUPS PPDs at top level:     $CUPS_PPDS_AT_TOP_LEVEL"
     fi
@@ -32132,7 +33186,7 @@ echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
 echo "    Build test programs:                        $BUILD_TEST"
 echo "    Build testpattern generator:                $BUILD_TESTPATTERN"
 echo
-echo "Installation summary:"
+echo "  Installation summary:"
 echo "    Installation prefix:                        $prefix"
 echo "    Data directory:                             $PACKAGE_DATA_DIR"
 echo "    Library directory:                          $PACKAGE_LIB_DIR"
@@ -32140,7 +33194,7 @@ echo "    XML data directory:                         $PKGXMLDATADIR"
 echo "    Module directory:                           $PKGMODULEDIR"
 echo "    Install sample images:                      $INSTALL_SAMPLES"
 echo
-echo "General configuration:"
+echo "  General configuration:"
 if test x$ac_compiler_gnu = "xyes"; then
     echo "    Compiler options:                           $CFLAGS $GNUCFLAGS"
 else
@@ -32158,6 +33212,7 @@ if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
 else
     echo "    Use readline libraries:                     $USE_READLINE"
 fi
+echo "    uname -a output:                            `uname -a`"
 echo "================================================================"
 if test $warnings_emitted -ne 0 ; then
     echo
diff --git a/configure.ac b/configure.ac
index 981fbc9..1807571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.180 2008/04/28 02:06:43 rlk Exp $
+dnl $Id: configure.ac,v 1.205 2008/10/19 19:35:30 rlk Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -36,11 +36,11 @@ dnl For more detailed information, see the libtool info documentation.
 dnl
 pushdef([GUTENPRINT_NAME],              [gutenprint])
 pushdef([GUTENPRINT_MAJOR_VERSION],     [5])
-pushdef([GUTENPRINT_MINOR_VERSION],     [1])
-pushdef([GUTENPRINT_MICRO_VERSION],     [98])
-pushdef([GUTENPRINT_EXTRA_VERSION],     [.2])
+pushdef([GUTENPRINT_MINOR_VERSION],     [2])
+pushdef([GUTENPRINT_MICRO_VERSION],     [1])
+pushdef([GUTENPRINT_EXTRA_VERSION],     [])
 pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
-pushdef([GUTENPRINT_INTERFACE_AGE],     [0])
+pushdef([GUTENPRINT_INTERFACE_AGE],     [3])
 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.180 $)
+AC_REVISION($Revision: 1.205 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -206,12 +206,23 @@ STP_ARG_WITH_DETAILED(
      cups_prefix="${prefix}"
   ])
 
+dnl GNU gettext checks.
+AM_GNU_GETTEXT_VERSION([0.16])
+AM_GNU_GETTEXT([external])
+
+AM_CONDITIONAL(USE_NLS, test x${USE_NLS} = xyes)
+
+STP_ARG_ENABLE([nls-macosx],
+               [build CUPS PPD files],
+               [USE_NLS_OSX],
+               [(automatic)])
+
 USE_LEVEL3_PS=no
 BUILD_CUPS_PPDS="${BUILD_CUPS}"
-BUILD_TRANSLATED_CUPS_PPDS="${BUILD_CUPS}"
+BUILD_TRANSLATED_CUPS_PPDS=no
 BUILD_CUPS_1_2="no"
 if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
-  cups_version=`${CUPS_CONFIG} --version`
+  cups_version=`${CUPS_CONFIG} --version | sed -e '1,$s/svn$/.0/'`
 dnl Quote to protect sed regexes
   [cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`]
   [cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`]
@@ -236,10 +247,25 @@ STP_ARG_ENABLE([cups-1_2-enhancements],
                [BUILD_CUPS_1_2],
                [(automatic)])
 
+if test "$USE_NLS" != no -a "$BUILD_CUPS_PPDS" = yes ; then
+   BUILD_TRANSLATED_CUPS_PPDS="yes"
+fi
+
 STP_ARG_ENABLE([translated-cups-ppds],
                [build translated CUPS PPD files],
                [BUILD_TRANSLATED_CUPS_PPDS],
-               [yes])
+               [(automatic)])
+
+if test "$BUILD_CUPS_1_2" = yes -a "$BUILD_TRANSLATED_CUPS_PPDS" = yes ; then
+   BUILD_GLOBALIZED_CUPS_PPDS=yes
+else
+   BUILD_GLOBALIZED_CUPS_PPDS=no
+fi
+
+STP_ARG_ENABLE([globalized-cups-ppds],
+               [build globalized CUPS PPD files],
+               [BUILD_GLOBALIZED_CUPS_PPDS],
+               [(automatic)])
 
 STP_ARG_ENABLE_DETAILED([simplified-cups-ppds],
 			[],
@@ -452,6 +478,7 @@ dnl aclocal flags.
 dnl AM_ACLOCAL_INCLUDE(m4 m4local)
 
 dnl Checks for programs.
+AM_ICONV_LINK
 AC_ISC_POSIX
 AC_PROG_AWK
 AC_PROG_CC
@@ -536,10 +563,6 @@ if test x${BUILD_GHOSTSCRIPT} = xyes ; then
   IJS_LIBS=`$IJS_CONFIG --libs`
 fi
 
-dnl GNU gettext checks.
-AM_GNU_GETTEXT_VERSION([0.11.5])
-AM_GNU_GETTEXT([external])
-
 GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_MAJOR_VERSION}.${GUTENPRINT_MINOR_VERSION}
 AH_TEMPLATE(GUTENPRINT_RELEASE_VERSION,, [Gutenprint release version])
 AC_DEFINE_UNQUOTED(GUTENPRINT_RELEASE_VERSION, "${GUTENPRINT_RELEASE_VERSION}")
@@ -767,7 +790,9 @@ AM_CONDITIONAL(BUILD_CUPS_PPDS, test x${BUILD_CUPS_PPDS} = xyes)
 
 AM_CONDITIONAL(CUPS_PPDS_AT_TOP_LEVEL, test x${CUPS_PPDS_AT_TOP_LEVEL} = xyes)
 
-AM_CONDITIONAL(BUILD_TRANSLATED_CUPS_PPDS, test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes)
+AM_CONDITIONAL(BUILD_TRANSLATED_CUPS_PPDS, test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes )
+
+AM_CONDITIONAL(BUILD_GLOBALIZED_CUPS_PPDS, test x${BUILD_GLOBALIZED_CUPS_PPDS} = xyes )
 
 AM_CONDITIONAL(BUILD_SIMPLIFIED_CUPS_PPDS, test x${BUILD_SIMPLIFIED_CUPS_PPDS} = xyes)
 
@@ -797,8 +822,6 @@ AM_CONDITIONAL(INSTALL_USER_GUIDE, test x${INSTALL_USER_GUIDE} = xyes)
 
 STP_CUPS_PATH
 
-AM_CONDITIONAL(USE_NLS, test x${USE_NLS} = xyes)
-
 # loadable modules
 # portable sh has no AND test...
 if test -n "$HAVE_LTDL_H"; then
@@ -869,8 +892,13 @@ else
   AC_DEFINE_UNQUOTED(CUPS_MODELDIR, "${cups_conf_datadir}/model/${PACKAGE}/${GUTENPRINT_RELEASE_VERSION}/")
 fi
 
+AC_ARG_WITH(cups_nickname, [  --with-cups-nickname="nickname suffix"
+                          Suffix to add to PPD NickName, default=" - CUPS+Gutenprint v"],
+  CUPS_PPD_NICKNAME_STRING="$withval",
+  CUPS_PPD_NICKNAME_STRING=" - CUPS+Gutenprint v")
+
 AH_TEMPLATE(CUPS_PPD_NICKNAME_STRING,, [CUPS PPD Nickname string])
-AC_DEFINE_UNQUOTED(CUPS_PPD_NICKNAME_STRING, [" - CUPS+Gutenprint v"])
+AC_DEFINE_UNQUOTED(CUPS_PPD_NICKNAME_STRING, "$CUPS_PPD_NICKNAME_STRING")
 
 
 AC_DEFINE_UNQUOTED(CUPS_PPD_PS_LEVEL, ${CUPS_PPD_PS_LEVEL}, [CUPS PPD PostScript level])
@@ -920,6 +948,12 @@ AC_SUBST(PLUG_IN_PATH)
 AC_SUBST(WHICH_PPDS)
 AC_SUBST(BUILD_CUPS_PPDS)
 
+dnl Optional architecture options to be applied after all autoconf tests
+dnl are done...
+AC_ARG_WITH(archflags, [  --with-archflags="..."  additional options for CFLAGS and LDFLAGS],
+    CFLAGS="$CFLAGS $withval"
+    LDFLAGS="$LDFLAGS $withval")
+
 dnl Output files
 
 AC_CONFIG_FILES([Makefile])
@@ -941,6 +975,7 @@ AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([samples/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/cups/Makefile])
+AC_CONFIG_FILES([src/cups/Info.plist])
 AC_CONFIG_FILES([src/cups/cups-genppdupdate],
                 [chmod +x src/cups/cups-genppdupdate])
 AC_CONFIG_FILES([src/escputil/Makefile])
@@ -958,6 +993,15 @@ AC_CONFIG_FILES([src/testpattern/Makefile])
 AC_CONFIG_FILES([src/gimp2/Makefile])
 AC_CONFIG_FILES([src/main/Makefile])
 AC_CONFIG_FILES([src/main/gutenprint.pc])
+AC_CONFIG_FILES([src/xml/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/media/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/mediasizes/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/model/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/inputslots/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/inks/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/weaves/Makefile])
+AC_CONFIG_FILES([src/xml/escp2/qualitypresets/Makefile])
 AC_CONFIG_FILES([src/gutenprintui2/Makefile])
 AC_CONFIG_FILES([src/gutenprintui2/gutenprintui2.pc])
 AC_CONFIG_FILES([test/Makefile])
@@ -988,6 +1032,7 @@ if test "$BUILD_CUPS" != "no" ; then
     echo "        Build CUPS PPD files:                   $BUILD_CUPS_PPDS"
     if test "$BUILD_CUPS_PPDS" != "no" ; then
 	echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
+	echo "                Build global CUPS PPD files:    $BUILD_GLOBALIZED_CUPS_PPDS"
 	echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
 	echo "            Install CUPS PPDs at top level:     $CUPS_PPDS_AT_TOP_LEVEL"
     fi
@@ -1027,7 +1072,7 @@ echo "    Build EPSON Stylus utility:                 $BUILD_ESCPUTIL"
 echo "    Build test programs:                        $BUILD_TEST"
 echo "    Build testpattern generator:                $BUILD_TESTPATTERN"
 echo
-echo "Installation summary:"
+echo "  Installation summary:"
 echo "    Installation prefix:                        $prefix"
 echo "    Data directory:                             $PACKAGE_DATA_DIR"
 echo "    Library directory:                          $PACKAGE_LIB_DIR"
@@ -1035,7 +1080,7 @@ echo "    XML data directory:                         $PKGXMLDATADIR"
 echo "    Module directory:                           $PKGMODULEDIR"
 echo "    Install sample images:                      $INSTALL_SAMPLES"
 echo
-echo "General configuration:"
+echo "  General configuration:"
 if test x$ac_compiler_gnu = "xyes"; then
     echo "    Compiler options:                           $CFLAGS $GNUCFLAGS"
 else
@@ -1053,6 +1098,7 @@ if test -n "$EXTRA_LIBREADLINE_DEPS" ; then
 else
     echo "    Use readline libraries:                     $USE_READLINE"
 fi
+echo "    uname -a output:                            `uname -a`"
 echo "================================================================"
 if test $warnings_emitted -ne 0 ; then
     echo
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d574cd8..78fcc67 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -44,7 +44,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -99,6 +100,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -119,6 +121,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -151,6 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -171,9 +175,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -200,6 +205,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -404,8 +410,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -430,8 +436,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -441,13 +447,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/doc/README.maintaining b/doc/README.maintaining
index cab861b..8cfae28 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.24 2008/02/28 01:22:13 rlk Exp $
+ $Id: README.maintaining,v 1.27 2008/07/29 01:52:09 rlk Exp $
 
 
 1. Setting up the autotools
@@ -58,15 +58,28 @@ something that you would like covering, please let me know!
 To build Gutenprint from CVS, or to regenerate the build scripts after
 modifying them, you need to install a number of GNU tools:
 
-i.   GNU autoconf (at least 2.54; at least 2.59 recommended)
-ii.  GNU automake (at least 1.9)
-iii. GNU libtool (at least 1.5; at least 1.5.20 recommended)
-iv.  GNU gettext (at least 0.12; at least 0.14 recommended)
-v.   GNU make (any recent version)
+i.    GNU autoconf (at least 2.54; at least 2.59 recommended)
+ii.   GNU automake (at least 1.9)
+iii.  GNU libtool (at least 1.5; at least 1.5.20 recommended)
+iv.   GNU gettext (at least 0.16)
+v.    GNU make (any recent version)
 
 and also
 
-vi.  pkg-config (at least 0.18.0)
+vi.   pkg-config (at least 0.18.0)
+
+Additional packages are required to build certain parts of Gutenprint
+from CVS that are not needed when building from a normal distribution.
+These packages include:
+
+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
+
+These packages are in addition to the packages normally required to
+build Gutenprint, as described in the README at top level.
 
 
 2. Integration of the autotools
@@ -187,16 +200,6 @@ generated if you run make after running './autogen.sh' or './configure
 --enable-maintainer-mode'.  It is only generated if `maintainer-mode'
 is enabled, and should be present in the release tarball.
 
-Other packages (including the extra development packages on some
-systems) must be installed on your system to build correctly.  These
-include: autoconf, automake, libtool, gtk, gdk, gimp 2.x, cups,
-foomatic, readline, and a DocBook processor (db2html, db2pdf,
-db2html).  Not all these need to be installed, depending on the
-configure options used (GIMP, CUPS, Foomatic and readline are
-optional).  It might be necessary to get the latest releases of some
-of these packages, as critical bugs present in earlier releases have
-been fixed.  The latest gettext is strongly suggested.
-
 3.4 Extra make targets
 ----------------------
 The Makefiles can do much more than build the package.  `targets' can
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index 0dc93c1..c0c8852 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,7 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -86,6 +87,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -106,6 +108,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -138,6 +141,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -158,9 +162,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -187,6 +192,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index 895b771..89e5b6f 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 c828b3a..6a949f2 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 a6f6365..0382c3f 100644
--- a/doc/gutenprint-users-manual.pdf
+++ b/doc/gutenprint-users-manual.pdf
diff --git a/doc/gutenprint.dox.in b/doc/gutenprint.dox.in
index ece7460..9c01e06 100644
--- a/doc/gutenprint.dox.in
+++ b/doc/gutenprint.dox.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.2
+# Doxyfile 1.5.3
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "libgutenprint API Reference"
+PROJECT_NAME           = "libgutenprint API Reference "
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -133,11 +133,19 @@ SHORT_NAMES            = NO
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
 # treat a multi-line C++ special comment block (i.e. a block of //! or /// 
 # comments) as a brief description. This used to be the default behaviour. 
@@ -256,6 +264,13 @@ EXTRACT_LOCAL_CLASSES  = YES
 
 EXTRACT_LOCAL_METHODS  = NO
 
+# If this flag is set to YES, the members of anonymous namespaces will be extracted 
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
+# where file will be replaced with the base name of the file that contains the anonymous 
+# namespace. By default anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
 # If set to NO (the default) these members will be included in the 
@@ -445,7 +460,7 @@ WARN_NO_PARAMDOC       = NO
 # $version, which will be replaced by the version of the file (if it could 
 # be obtained via FILE_VERSION_FILTER)
 
-WARN_FORMAT            = "$file:$line: $text"
+WARN_FORMAT            = "$file:$line: $text "
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning 
 # and error messages should be written. If left blank the output is written 
@@ -571,7 +586,9 @@ FILTER_SOURCE_FILES    = NO
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
 # be generated. Documented entities will be cross-referenced with these sources. 
 # Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
+# then you must also enable this option. If you don't then doxygen will produce 
+# a warning and turn it on anyway
 
 SOURCE_BROWSER         = NO
 
@@ -697,6 +714,14 @@ HTML_ALIGN_MEMBERS     = YES
 
 GENERATE_HTMLHELP      = NO
 
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
@@ -1167,7 +1192,7 @@ INCLUDE_GRAPH          = NO
 
 INCLUDED_BY_GRAPH      = NO
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
 # generate a call dependency graph for every global function or class method. 
 # Note that enabling this option will significantly increase the time of a run. 
 # So in most cases it will be better to enable call graphs for selected 
@@ -1175,7 +1200,7 @@ INCLUDED_BY_GRAPH      = NO
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
 # generate a caller dependency graph for every global function or class method. 
 # Note that enabling this option will significantly increase the time of a run. 
 # So in most cases it will be better to enable caller graphs for selected 
@@ -1215,11 +1240,23 @@ DOTFILE_DIRS           =
 # The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
 # nodes that will be shown in the graph. If the number of nodes in a graph 
 # becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen will always 
-# show the root nodes and its direct children regardless of this setting.
+# visualized by representing a node as a red box. Note that doxygen if the number 
+# of direct children of the root node in a graph is already larger than 
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
 # background. This is disabled by default, which results in a white background. 
 # Warning: Depending on the platform used, enabling this option may lead to 
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index 917e861..9fe9656 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -343,7 +343,14 @@
     <path>/home/rlk/sandbox/print-5.1/include/gutenprint/</path>
     <filename>color_8h</filename>
     <class kind="struct">stp_colorfuncs_t</class>
-    <class kind="struct">stp_color_t</class>
+    <class kind="struct">stp_color</class>
+    <member kind="typedef">
+      <type>struct stp_color</type>
+      <name>stp_color_t</name>
+      <anchorfile>group__color.html</anchorfile>
+      <anchor>gd1408f9835b72f266ec7c7e1e1202a74</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
@@ -542,71 +549,85 @@
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g982f8191c84b049cc3ad3cee1558fc23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g3ae3af552b490b0ca8b02e442ac9547a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g7eddbee28cb1f3c76a19408b86ea142e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g86d146e483ca1902f973d574f542b85f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b</anchor>
       <arglist></arglist>
     </member>
@@ -951,12 +972,12 @@
     <name>dither.h</name>
     <path>/home/rlk/sandbox/print-5.1/include/gutenprint/</path>
     <filename>dither_8h</filename>
-    <class kind="struct">stp_dither_matrix_short_t</class>
-    <class kind="struct">stp_dither_matrix_normal_t</class>
-    <class kind="struct">stp_dither_matrix_generic_t</class>
-    <class kind="struct">stp_dither_matrix_impl_t</class>
-    <class kind="struct">stp_dotsize_t</class>
-    <class kind="struct">stp_shade_t</class>
+    <class kind="struct">stp_dither_matrix_short</class>
+    <class kind="struct">stp_dither_matrix_normal</class>
+    <class kind="struct">stp_dither_matrix_generic</class>
+    <class kind="struct">dither_matrix_impl</class>
+    <class kind="struct">stp_dotsize</class>
+    <class kind="struct">stp_shade</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_K</name>
@@ -992,6 +1013,48 @@
       <anchor>bda31f8e7a9e473057644a5fe4a2339b</anchor>
       <arglist></arglist>
     </member>
+    <member kind="typedef">
+      <type>struct stp_dither_matrix_short</type>
+      <name>stp_dither_matrix_short_t</name>
+      <anchorfile>dither_8h.html</anchorfile>
+      <anchor>9a2c54a4730e2c9bb25cf95f6cd3e597</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_dither_matrix_normal</type>
+      <name>stp_dither_matrix_normal_t</name>
+      <anchorfile>dither_8h.html</anchorfile>
+      <anchor>febf0484e151cf3cce4ef0b9911d0022</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_dither_matrix_generic</type>
+      <name>stp_dither_matrix_generic_t</name>
+      <anchorfile>dither_8h.html</anchorfile>
+      <anchor>9f5f63d4f792df1d7becccf3fb5c8fdd</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct dither_matrix_impl</type>
+      <name>stp_dither_matrix_impl_t</name>
+      <anchorfile>dither_8h.html</anchorfile>
+      <anchor>f823fed10cb9591c0e659033ec49f55f</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_dotsize</type>
+      <name>stp_dotsize_t</name>
+      <anchorfile>dither_8h.html</anchorfile>
+      <anchor>7a74b9371fd47b48d961d2316e2126e4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_shade</type>
+      <name>stp_shade_t</name>
+      <anchorfile>dither_8h.html</anchorfile>
+      <anchor>5baefb325bf92b7ca10c2d057c04b835</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_iterated_init</name>
@@ -1462,7 +1525,7 @@
     <name>image.h</name>
     <path>/home/rlk/sandbox/print-5.1/include/gutenprint/</path>
     <filename>image_8h</filename>
-    <class kind="struct">stp_image_t</class>
+    <class kind="struct">stp_image</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
@@ -1470,18 +1533,28 @@
       <anchor>g0b7daa7e9e9b26fea847d71ca9de7c02</anchor>
       <arglist></arglist>
     </member>
+    <member kind="typedef">
+      <type>struct stp_image</type>
+      <name>stp_image_t</name>
+      <anchorfile>group__image.html</anchorfile>
+      <anchor>gae0b5ef92b619849a51cb75d376a90fb</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
+      <anchorfile>group__image.html</anchorfile>
       <anchor>g58672e1989d582c14328048b207657c8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
+      <anchorfile>group__image.html</anchorfile>
       <anchor>gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
+      <anchorfile>group__image.html</anchorfile>
       <anchor>gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274</anchor>
       <arglist></arglist>
     </member>
@@ -1769,35 +1842,55 @@
     <path>/home/rlk/sandbox/print-5.1/include/gutenprint/</path>
     <filename>module_8h</filename>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
-    <class kind="struct">stp_module_version_t</class>
-    <class kind="struct">stp_module_t</class>
+    <class kind="struct">stp_module_version</class>
+    <class kind="struct">stp_module</class>
+    <member kind="typedef">
+      <type>struct stp_module_version</type>
+      <name>stp_module_version_t</name>
+      <anchorfile>module_8h.html</anchorfile>
+      <anchor>753a8450e5ac6b73134c12b89533f16e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_module</type>
+      <name>stp_module_t</name>
+      <anchorfile>module_8h.html</anchorfile>
+      <anchor>e1e92953e8ffaa00cfbf7fc01e51f36d</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="enumeration">
       <name>stp_module_class_t</name>
+      <anchorfile>module_8h.html</anchorfile>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a42</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_INVALID</name>
+      <anchorfile>module_8h.html</anchorfile>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_MISC</name>
+      <anchorfile>module_8h.html</anchorfile>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_FAMILY</name>
+      <anchorfile>module_8h.html</anchorfile>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_COLOR</name>
+      <anchorfile>module_8h.html</anchorfile>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_DITHER</name>
+      <anchorfile>module_8h.html</anchorfile>
       <anchor>b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841</anchor>
       <arglist></arglist>
     </member>
@@ -1848,10 +1941,10 @@
     <name>mxml.h</name>
     <path>/home/rlk/sandbox/print-5.1/include/gutenprint/</path>
     <filename>mxml_8h</filename>
-    <class kind="struct">stp_mxml_attr_t</class>
-    <class kind="struct">stp_mxml_element_t</class>
-    <class kind="struct">stp_mxml_text_t</class>
-    <class kind="union">stp_mxml_value_t</class>
+    <class kind="struct">stp_mxml_attr_s</class>
+    <class kind="struct">stp_mxml_value_s</class>
+    <class kind="struct">stp_mxml_text_s</class>
+    <class kind="union">stp_mxml_value_u</class>
     <class kind="struct">stp_mxml_node_s</class>
     <member kind="define">
       <type>#define</type>
@@ -1959,6 +2052,34 @@
       <arglist></arglist>
     </member>
     <member kind="typedef">
+      <type>struct stp_mxml_attr_s</type>
+      <name>stp_mxml_attr_t</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>b271ad8c2bb8d7e6b4b453ffe5589564</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_mxml_value_s</type>
+      <name>stp_mxml_element_t</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>70e20b752807f49a56b56d80ee470b47</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>struct stp_mxml_text_s</type>
+      <name>stp_mxml_text_t</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>b9c0236a2d70c3bcb210a9f6fadf00a3</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
+      <type>union stp_mxml_value_u</type>
+      <name>stp_mxml_value_t</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>9a2e2ffccac3c73524e76f3e816d35bf</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="typedef">
       <type>struct stp_mxml_node_s</type>
       <name>stp_mxml_node_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
@@ -1967,31 +2088,37 @@
     </member>
     <member kind="enumeration">
       <name>stp_mxml_type_e</name>
+      <anchorfile>mxml_8h.html</anchorfile>
       <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_ELEMENT</name>
+      <anchorfile>mxml_8h.html</anchorfile>
       <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_INTEGER</name>
+      <anchorfile>mxml_8h.html</anchorfile>
       <anchor>f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_OPAQUE</name>
+      <anchorfile>mxml_8h.html</anchorfile>
       <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_REAL</name>
+      <anchorfile>mxml_8h.html</anchorfile>
       <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_TEXT</name>
+      <anchorfile>mxml_8h.html</anchorfile>
       <anchor>f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9</anchor>
       <arglist></arglist>
     </member>
@@ -2039,6 +2166,13 @@
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
+      <name>stp_mxmlLoadFromFile</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>7fbf0906a36fe755779077efd7126704</anchor>
+      <arglist>(stp_mxml_node_t *top, const char *file, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_mxml_node_t *</type>
       <name>stp_mxmlLoadString</name>
       <anchorfile>mxml_8h.html</anchorfile>
       <anchor>4a2465973559fe7815386d0d59d9a8ee</anchor>
@@ -2102,6 +2236,13 @@
     </member>
     <member kind="function">
       <type>int</type>
+      <name>stp_mxmlSaveToFile</name>
+      <anchorfile>mxml_8h.html</anchorfile>
+      <anchor>ee3de9dc6a961f11238960d1dd1ea5c3</anchor>
+      <arglist>(stp_mxml_node_t *node, const char *fp, int(*cb)(stp_mxml_node_t *, int))</arglist>
+    </member>
+    <member kind="function">
+      <type>int</type>
       <name>stp_mxmlSaveString</name>
       <anchorfile>mxml_8h.html</anchorfile>
       <anchor>054f6b6df45f2e0072a61c1a438d3ebe</anchor>
@@ -2130,41 +2271,49 @@
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>g72e4619e373e38dc02dc452813b7b958</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_papersize_type_t</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>g31255c4eebfaaf5cd319e5638a6a3069</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_TYPE_STANDARD</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg31255c4eebfaaf5cd319e5638a6a306999d27f84f91d583c3e465e56c83fff2f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_TYPE_ENVELOPE</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg31255c4eebfaaf5cd319e5638a6a3069660290248a563e7590202afd3ba68fb4</anchor>
       <arglist></arglist>
     </member>
@@ -2191,6 +2340,13 @@
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
+      <name>stp_get_papersize_by_size_exact</name>
+      <anchorfile>group__papersize.html</anchorfile>
+      <anchor>g879cd515ca2eb5fd8cd76ae62f4bfa4e</anchor>
+      <arglist>(int length, int width)</arglist>
+    </member>
+    <member kind="function">
+      <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_index</name>
       <anchorfile>group__papersize.html</anchorfile>
       <anchor>gb2e9f694a3b90aeaaa14d6af3b5fe75a</anchor>
@@ -2222,6 +2378,27 @@
       <anchor>f08851d96a1197c5ce39f7dc812cef3f</anchor>
       <arglist>(stp_list_t *list, const char *path)</arglist>
     </member>
+    <member kind="function">
+      <type>stp_list_t *</type>
+      <name>stpi_data_path</name>
+      <anchorfile>path_8h.html</anchorfile>
+      <anchor>26017fec6cd9c9e44bc58b4cac9b9c35</anchor>
+      <arglist>(void)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_list_t *</type>
+      <name>stpi_list_files_on_data_path</name>
+      <anchorfile>path_8h.html</anchorfile>
+      <anchor>037cae76d9cb1916ec7fa711a127fe54</anchor>
+      <arglist>(const char *name)</arglist>
+    </member>
+    <member kind="function">
+      <type>char *</type>
+      <name>stpi_path_merge</name>
+      <anchorfile>path_8h.html</anchorfile>
+      <anchor>17eca69c41eb6cca959ab47e3c1a3aa2</anchor>
+      <arglist>(const char *path, const char *file)</arglist>
+    </member>
   </compound>
   <compound kind="file">
     <name>printers.h</name>
@@ -2231,7 +2408,7 @@
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
     <class kind="struct">stp_printfuncs_t</class>
-    <class kind="struct">stp_family_t</class>
+    <class kind="struct">stp_family</class>
     <member kind="typedef">
       <type>struct stp_printer</type>
       <name>stp_printer_t</name>
@@ -2239,6 +2416,13 @@
       <anchor>gcddc2ce7fa4e0a68fcc30c123503738f</anchor>
       <arglist></arglist>
     </member>
+    <member kind="typedef">
+      <type>struct stp_family</type>
+      <name>stp_family_t</name>
+      <anchorfile>group__printer.html</anchorfile>
+      <anchor>g66a5e7cf2b1743a46bd78cb851e1d0a4</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
@@ -2331,6 +2515,13 @@
       <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
+      <type>void</type>
+      <name>stp_set_printer_defaults_soft</name>
+      <anchorfile>group__printer.html</anchorfile>
+      <anchor>gc2ed6f27e4db29ceaa74a1b9bd6a78cf</anchor>
+      <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
+    </member>
+    <member kind="function">
       <type>int</type>
       <name>stp_print</name>
       <anchorfile>group__printer.html</anchorfile>
@@ -2889,6 +3080,13 @@
     </member>
     <member kind="define">
       <type>#define</type>
+      <name>STP_DBG_NO_COMPRESSION</name>
+      <anchorfile>group__util.html</anchorfile>
+      <anchor>ga447450ea502f96203aa2c47f6e49e92</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
       <anchor>ga5a86efbbd3e2eb391718d82a1d7ffcc</anchor>
@@ -3158,6 +3356,13 @@
       <anchor>gd888c1f6a36f999ffebfffa7b74f28d2</anchor>
       <arglist>(x)</arglist>
     </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>STP_CHANNEL_NONE</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g4f46af65b4df5881b980acba32a05b70</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="typedef">
       <type>struct stp_vars</type>
       <name>stp_vars_t</name>
@@ -3209,171 +3414,205 @@
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>g9b3d4f47a44c0c8c9b150cddc56d2a91</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>g4eba7e712c0e17b76e472f26e202d7b8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gaa9c9265ffe70122bd33659cf2983207</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>g70ebf70dc8e6199d84fc91985c94bae9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gc061852de3627383cd415cd80a979e02</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6</anchor>
       <arglist></arglist>
     </member>
@@ -3967,66 +4206,150 @@
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_clear_parameter</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g390f7c2fe642bea08507374a184de233</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_string_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g110e543418842a6dd79149409620bf13</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_file_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g76c7e033078e6c2fa276ee72ca97c63c</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_float_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>gdec4183ce240188ed18fdc21d9b518f7</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_int_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>ge08d29a439b77219f32d037ab5b191f5</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_dimension_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g5cae4a118badc7c52e5f7b7543c83d8e</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_boolean_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g60f98e23144fd1bf5aa53def670b2c91</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_curve_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g1329d614d6cd18fc6c244b020e26b081</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_array_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g16d23d59368e907a29719f0902ea75fe</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_raw_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g4d06ccaf72d08800f7eb78b3293f4a00</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g27864133bc2159d1472cbdfb3b781c27</anchor>
+      <arglist>(const stp_vars_t *v, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_set_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g6ed828e872f7678a89e1b065d377112e</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>gc9f06e27ce5b6808d30c6fc01558db3b</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gaecd310feb8bd9a2188a9b287656aa1a</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g0628a3f1feb7db7b5b10249a2b4f2412</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g15a5458adea6ad4eecda3c990acbc6cb</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g49e5b05ba7bf8ccf6e95cb744f4f0f93</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g7487203059e7ccd71c4673656b3042b1</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g0cc1a26e8c3d502024c55a065fd5629a</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g0f6e91baac5e78703b162e9d23c0a65c</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g28feceb75f731d6de08d1fdad1fc269e</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g9ad15a73dd8c755a8b80edbe335285ee</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g3b74af22c776ddebd6b70455e196fe1c</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ge7f21b118a8dfb5607334a6141d5dc5c</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g0486744f97114ba03d4f8f7562d6c739</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gb78f4273798c6e3e720afe01680cf752</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g4d13479ad3669ec9b8d7dcc109bc8e7d</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g364fcdb2e57b8ca99867c94954cf14cd</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g47b8c3b31693ecdef420160b40b23a0d</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_set_parameter_active</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g5ececd1972a375e1e569ed4a242ed1ed</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
@@ -4092,6 +4415,13 @@
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
+      <type>int</type>
+      <name>stp_check_parameter</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>ga416ba26ede5046db94b54b9d846e329</anchor>
+      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
@@ -4155,6 +4485,13 @@
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
+      <type>stp_parameter_activity_t</type>
+      <name>stp_get_parameter_active</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g31b32d5481a838276f23cfa4bc010c03</anchor>
+      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
@@ -4308,36 +4645,43 @@
     </member>
     <member kind="enumeration">
       <name>stp_weave_strategy_t</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf38580991</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ZIGZAG</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_DESCENDING</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_2X</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_STAGGERED</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_3X</name>
+      <anchorfile>weave_8h.html</anchorfile>
       <anchor>059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1</anchor>
       <arglist></arglist>
     </member>
@@ -4523,6 +4867,34 @@
       <arglist>(const char *textval)</arglist>
     </member>
     <member kind="function">
+      <type>stp_raw_t *</type>
+      <name>stp_xmlstrtoraw</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>4a44cfc8ec6e821c4f8564397b3bd66f</anchor>
+      <arglist>(const char *textval)</arglist>
+    </member>
+    <member kind="function">
+      <type>char *</type>
+      <name>stp_rawtoxmlstr</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>3e003171cb008a542fffbeff3f2e2299</anchor>
+      <arglist>(const stp_raw_t *raw)</arglist>
+    </member>
+    <member kind="function">
+      <type>char *</type>
+      <name>stp_strtoxmlstr</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>6bdda178f51ef17e02b0c662e0b06a8b</anchor>
+      <arglist>(const char *raw)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_prtraw</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>13a01102edf22955690bf21a44049369</anchor>
+      <arglist>(const stp_raw_t *raw, FILE *fp)</arglist>
+    </member>
+    <member kind="function">
       <type>void</type>
       <name>stp_xml_init</name>
       <anchorfile>xml_8h.html</anchorfile>
@@ -4593,6 +4965,13 @@
       <arglist>(stp_mxml_node_t *array)</arglist>
     </member>
     <member kind="function">
+      <type>stp_vars_t *</type>
+      <name>stp_vars_create_from_xmltree</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>2ec4cf1f87b354d564429f3d34afd029</anchor>
+      <arglist>(stp_mxml_node_t *da)</arglist>
+    </member>
+    <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_array</name>
       <anchorfile>xml_8h.html</anchorfile>
@@ -4600,6 +4979,34 @@
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
+      <type>stp_vars_t *</type>
+      <name>stp_vars_create_from_xmltree_ref</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>cecaf19b0eb498487f14bf462c181c16</anchor>
+      <arglist>(stp_mxml_node_t *da, stp_mxml_node_t *root)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_vars_fill_from_xmltree</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>c0c8478cc24d2aee3eaaf7eafa4586b9</anchor>
+      <arglist>(stp_mxml_node_t *da, stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_vars_fill_from_xmltree_ref</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>152b1cd11fb8bc6b7ecc95c65ee74ec6</anchor>
+      <arglist>(stp_mxml_node_t *da, stp_mxml_node_t *root, stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_mxml_node_t *</type>
+      <name>stp_xmltree_create_from_vars</name>
+      <anchorfile>xml_8h.html</anchorfile>
+      <anchor>139bc6e17f2ccabf7e149241f923d9c4</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
       <type>void</type>
       <name>stp_xml_parse_file_named</name>
       <anchorfile>xml_8h.html</anchorfile>
@@ -4701,7 +5108,14 @@
     <title>color</title>
     <filename>group__color.html</filename>
     <class kind="struct">stp_colorfuncs_t</class>
-    <class kind="struct">stp_color_t</class>
+    <class kind="struct">stp_color</class>
+    <member kind="typedef">
+      <type>struct stp_color</type>
+      <name>stp_color_t</name>
+      <anchorfile>group__color.html</anchorfile>
+      <anchor>gd1408f9835b72f266ec7c7e1e1202a74</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
@@ -4801,71 +5215,85 @@
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g982f8191c84b049cc3ad3cee1558fc23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g3ae3af552b490b0ca8b02e442ac9547a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g7eddbee28cb1f3c76a19408b86ea142e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>g86d146e483ca1902f973d574f542b85f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
+      <anchorfile>group__curve.html</anchorfile>
       <anchor>gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b</anchor>
       <arglist></arglist>
     </member>
@@ -5421,7 +5849,7 @@
     <name>image</name>
     <title>image</title>
     <filename>group__image.html</filename>
-    <class kind="struct">stp_image_t</class>
+    <class kind="struct">stp_image</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
@@ -5429,18 +5857,28 @@
       <anchor>g0b7daa7e9e9b26fea847d71ca9de7c02</anchor>
       <arglist></arglist>
     </member>
+    <member kind="typedef">
+      <type>struct stp_image</type>
+      <name>stp_image_t</name>
+      <anchorfile>group__image.html</anchorfile>
+      <anchor>gae0b5ef92b619849a51cb75d376a90fb</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
+      <anchorfile>group__image.html</anchorfile>
       <anchor>g58672e1989d582c14328048b207657c8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
+      <anchorfile>group__image.html</anchorfile>
       <anchor>gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
+      <anchorfile>group__image.html</anchorfile>
       <anchor>gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274</anchor>
       <arglist></arglist>
     </member>
@@ -5730,41 +6168,49 @@
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>g72e4619e373e38dc02dc452813b7b958</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_papersize_type_t</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>g31255c4eebfaaf5cd319e5638a6a3069</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_TYPE_STANDARD</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg31255c4eebfaaf5cd319e5638a6a306999d27f84f91d583c3e465e56c83fff2f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_TYPE_ENVELOPE</name>
+      <anchorfile>group__papersize.html</anchorfile>
       <anchor>gg31255c4eebfaaf5cd319e5638a6a3069660290248a563e7590202afd3ba68fb4</anchor>
       <arglist></arglist>
     </member>
@@ -5791,6 +6237,13 @@
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
+      <name>stp_get_papersize_by_size_exact</name>
+      <anchorfile>group__papersize.html</anchorfile>
+      <anchor>g879cd515ca2eb5fd8cd76ae62f4bfa4e</anchor>
+      <arglist>(int length, int width)</arglist>
+    </member>
+    <member kind="function">
+      <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_index</name>
       <anchorfile>group__papersize.html</anchorfile>
       <anchor>gb2e9f694a3b90aeaaa14d6af3b5fe75a</anchor>
@@ -5809,7 +6262,7 @@
     <title>printer</title>
     <filename>group__printer.html</filename>
     <class kind="struct">stp_printfuncs_t</class>
-    <class kind="struct">stp_family_t</class>
+    <class kind="struct">stp_family</class>
     <member kind="typedef">
       <type>struct stp_printer</type>
       <name>stp_printer_t</name>
@@ -5817,6 +6270,13 @@
       <anchor>gcddc2ce7fa4e0a68fcc30c123503738f</anchor>
       <arglist></arglist>
     </member>
+    <member kind="typedef">
+      <type>struct stp_family</type>
+      <name>stp_family_t</name>
+      <anchorfile>group__printer.html</anchorfile>
+      <anchor>g66a5e7cf2b1743a46bd78cb851e1d0a4</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
@@ -5909,6 +6369,13 @@
       <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
+      <type>void</type>
+      <name>stp_set_printer_defaults_soft</name>
+      <anchorfile>group__printer.html</anchorfile>
+      <anchor>gc2ed6f27e4db29ceaa74a1b9bd6a78cf</anchor>
+      <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
+    </member>
+    <member kind="function">
       <type>int</type>
       <name>stp_print</name>
       <anchorfile>group__printer.html</anchorfile>
@@ -6375,6 +6842,13 @@
     </member>
     <member kind="define">
       <type>#define</type>
+      <name>STP_DBG_NO_COMPRESSION</name>
+      <anchorfile>group__util.html</anchorfile>
+      <anchor>ga447450ea502f96203aa2c47f6e49e92</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
       <anchor>ga5a86efbbd3e2eb391718d82a1d7ffcc</anchor>
@@ -6641,6 +7115,13 @@
       <anchor>gd888c1f6a36f999ffebfffa7b74f28d2</anchor>
       <arglist>(x)</arglist>
     </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>STP_CHANNEL_NONE</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g4f46af65b4df5881b980acba32a05b70</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="typedef">
       <type>struct stp_vars</type>
       <name>stp_vars_t</name>
@@ -6692,171 +7173,205 @@
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>g9b3d4f47a44c0c8c9b150cddc56d2a91</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>g4eba7e712c0e17b76e472f26e202d7b8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gaa9c9265ffe70122bd33659cf2983207</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>g70ebf70dc8e6199d84fc91985c94bae9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>gc061852de3627383cd415cd80a979e02</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
+      <anchorfile>group__vars.html</anchorfile>
       <anchor>ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6</anchor>
       <arglist></arglist>
     </member>
@@ -7450,66 +7965,150 @@
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_clear_parameter</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g390f7c2fe642bea08507374a184de233</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_string_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g110e543418842a6dd79149409620bf13</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_file_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g76c7e033078e6c2fa276ee72ca97c63c</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_float_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>gdec4183ce240188ed18fdc21d9b518f7</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_int_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>ge08d29a439b77219f32d037ab5b191f5</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_dimension_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g5cae4a118badc7c52e5f7b7543c83d8e</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_boolean_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g60f98e23144fd1bf5aa53def670b2c91</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_curve_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g1329d614d6cd18fc6c244b020e26b081</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_array_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g16d23d59368e907a29719f0902ea75fe</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_raw_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g4d06ccaf72d08800f7eb78b3293f4a00</anchor>
+      <arglist>(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>stp_string_list_t *</type>
+      <name>stp_list_parameters</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g27864133bc2159d1472cbdfb3b781c27</anchor>
+      <arglist>(const stp_vars_t *v, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_set_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g6ed828e872f7678a89e1b065d377112e</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>gc9f06e27ce5b6808d30c6fc01558db3b</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gaecd310feb8bd9a2188a9b287656aa1a</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g0628a3f1feb7db7b5b10249a2b4f2412</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g15a5458adea6ad4eecda3c990acbc6cb</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g49e5b05ba7bf8ccf6e95cb744f4f0f93</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g7487203059e7ccd71c4673656b3042b1</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g0cc1a26e8c3d502024c55a065fd5629a</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g0f6e91baac5e78703b162e9d23c0a65c</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g28feceb75f731d6de08d1fdad1fc269e</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g9ad15a73dd8c755a8b80edbe335285ee</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g3b74af22c776ddebd6b70455e196fe1c</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ge7f21b118a8dfb5607334a6141d5dc5c</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g0486744f97114ba03d4f8f7562d6c739</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>gb78f4273798c6e3e720afe01680cf752</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g4d13479ad3669ec9b8d7dcc109bc8e7d</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>g364fcdb2e57b8ca99867c94954cf14cd</anchor>
-      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+      <anchor>g47b8c3b31693ecdef420160b40b23a0d</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_set_parameter_active</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g5ececd1972a375e1e569ed4a242ed1ed</anchor>
+      <arglist>(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
@@ -7575,6 +8174,13 @@
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
+      <type>int</type>
+      <name>stp_check_parameter</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>ga416ba26ede5046db94b54b9d846e329</anchor>
+      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
@@ -7638,6 +8244,13 @@
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
+      <type>stp_parameter_activity_t</type>
+      <name>stp_get_parameter_active</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g31b32d5481a838276f23cfa4bc010c03</anchor>
+      <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_type_t type)</arglist>
+    </member>
+    <member kind="function">
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
@@ -7744,6 +8357,115 @@
     </member>
   </compound>
   <compound kind="struct">
+    <name>dither_matrix_impl</name>
+    <filename>structdither__matrix__impl.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>base</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>331debb887e076f8b52952ba6cc2b50b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>exp</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>db0e7fb4b5e5149f0815af448676df8b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>x_size</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>063e3b3617c3a9b4883f3b01cd7dfb48</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y_size</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>33370af30d4c6cb0e441744c8d1c3686</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>total_size</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>54645c1c4edad222cf3f5aba03cdfae5</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_x</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>f0728348e6da1cf904204ef88e0a5853</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_x_mod</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>16f516218f0c5a31a1eac49e5c57add5</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_y</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>c1a83c82c364098dce631ec7174574be</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_y_mod</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>d03881dd78211b5bcb1a62453c060d2e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>index</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>b744f40c883acc93ad0afbf5f048f27a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>i_own</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>78152fe120c430f6400b731e5c722bd3</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>x_offset</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>665c02056a2d046a15aab462492d9dbc</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y_offset</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>844cb19ea61f035bc2a21536f6f392c4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>fast_mask</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>8c7141e2e35f6cc14896d23d15a81914</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned *</type>
+      <name>matrix</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>e28102f9e3d3cfb8eb48d9e69e807f96</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
     <name>stp_cached_curve_t</name>
     <filename>structstp__cached__curve__t.html</filename>
     <member kind="variable">
@@ -7776,27 +8498,27 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_color_t</name>
-    <filename>structstp__color__t.html</filename>
+    <name>stp_color</name>
+    <filename>structstp__color.html</filename>
     <member kind="variable">
       <type>const char *</type>
       <name>short_name</name>
-      <anchorfile>structstp__color__t.html</anchorfile>
-      <anchor>5a0f6f24bbb0048b8c4c0acec3f38500</anchor>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>23ed4d11629625e2ad24b124c36c7fab</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>long_name</name>
-      <anchorfile>structstp__color__t.html</anchorfile>
-      <anchor>9680717a1d04dbb522fd3eeb5b4f723b</anchor>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>b7c0a627b31ebfb97fd1db2677032479</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_colorfuncs_t *</type>
       <name>colorfuncs</name>
-      <anchorfile>structstp__color__t.html</anchorfile>
-      <anchor>0ab4fc77eeb3eaedcea9c3a522fe5d57</anchor>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>4442d36d0bcf746130f82ffe6f90147f</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -7851,246 +8573,137 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dither_matrix_generic_t</name>
-    <filename>structstp__dither__matrix__generic__t.html</filename>
+    <name>stp_dither_matrix_generic</name>
+    <filename>structstp__dither__matrix__generic.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>x</name>
-      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
-      <anchor>44cd10631c067bb550173f14368bee2b</anchor>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>6b8bd1cc589c2195f055e5a57a05e03a</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
-      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
-      <anchor>2c8fdba16e3d594c2f929c521add0edb</anchor>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>aaddcac2ca33a3e822ded567bbbecfb9</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
-      <anchor>ce2509068a38f137997f78ee5f86a3fd</anchor>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>b963ddf7c0826bd3cc316c2375f1205b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
-      <anchor>21d0ef7610c911ac9638abc9abac81ad</anchor>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>478d54ddf9ba50e783ddec1532a0eff6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const void *</type>
       <name>data</name>
-      <anchorfile>structstp__dither__matrix__generic__t.html</anchorfile>
-      <anchor>7a5ebd299bf32fb0711c4598610d05b2</anchor>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>52acbda296a57a6087852eab62bc62db</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dither_matrix_impl_t</name>
-    <filename>structstp__dither__matrix__impl__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>base</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>77db65014dea5548e6954ee4a76b7fd7</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>exp</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>dfe3c9f5a067437a69bdd83d43f3f804</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>x_size</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>7ce1ac8940686b11ce88494bcc166c5b</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y_size</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>9cb8ed0493f8966e9929e1a966f0428c</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>total_size</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>094613ce00d0a095a9affae11be304f7</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_x</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>f0bb4535de37f2f78378fda1c7228886</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_x_mod</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>dd3deba1e7c232cb6d4890078dd14fe2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_y</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>87a160f3b15be1e006f54dd840b31708</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_y_mod</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>b14d418c4cd370f340b0a30ef0804952</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>index</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>808aaba40f97218310e7fec5f8ad3da1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>i_own</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>1dc9e02e9c08c84879a4432efcfdef40</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>x_offset</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>7a22d5818987bbcc0f77254c12519092</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y_offset</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>e975508a01d5d57d589edf14cb3e0bb0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>fast_mask</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>524c9ed01e5f7f07d03e808afbeb9883</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned *</type>
-      <name>matrix</name>
-      <anchorfile>structstp__dither__matrix__impl__t.html</anchorfile>
-      <anchor>80a41648eea9699edd5c90759caef00c</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_dither_matrix_normal_t</name>
-    <filename>structstp__dither__matrix__normal__t.html</filename>
+    <name>stp_dither_matrix_normal</name>
+    <filename>structstp__dither__matrix__normal.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>x</name>
-      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
-      <anchor>be31b8f8dcc4c48be9c912ed720f63a6</anchor>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>b9564690be42859d88ea264a29321af3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
-      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
-      <anchor>2247e48b75c8f12fe091e1ce9d9bc14d</anchor>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>410560f5186761cb7430f5b0a804b09c</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
-      <anchor>4e85b66600eecdb606761d97e8263931</anchor>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>d72d088edfe3223c2df8fd4fb6178b98</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
-      <anchor>04fe7e891c1cb7b4e36b640d29d2616b</anchor>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>042561ad856d67506fe81b1bbbffd966</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned *</type>
       <name>data</name>
-      <anchorfile>structstp__dither__matrix__normal__t.html</anchorfile>
-      <anchor>9c84f2864c2f2a07739e87030659b86d</anchor>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>e67cb37136c5e9d9c4b1a44cd2dab87b</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dither_matrix_short_t</name>
-    <filename>structstp__dither__matrix__short__t.html</filename>
+    <name>stp_dither_matrix_short</name>
+    <filename>structstp__dither__matrix__short.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>x</name>
-      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
-      <anchor>f3e1cc731d40f28a67b7cba541f341f5</anchor>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>81e0b20e763080b79faa837a00cac832</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
-      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
-      <anchor>32c82f9dc3fd5fe381a0c5cd6abb073d</anchor>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>2bbc6c72006541250ba23b48bcab60e8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
-      <anchor>f16fe3d197917c57878a7eb47fb74f89</anchor>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>d4d85727401505eab74e3e667f4a38f4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
-      <anchor>5cad2ace098daefb612a316c80013c19</anchor>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>755361acae80fa4cba01a1cc71638274</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned short *</type>
       <name>data</name>
-      <anchorfile>structstp__dither__matrix__short__t.html</anchorfile>
-      <anchor>e809b6e6f3abfb477fc01c959050976b</anchor>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>f4f6b5634ea79cf694782e35a8d7607d</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_dotsize_t</name>
-    <filename>structstp__dotsize__t.html</filename>
+    <name>stp_dotsize</name>
+    <filename>structstp__dotsize.html</filename>
     <member kind="variable">
       <type>unsigned</type>
       <name>bit_pattern</name>
-      <anchorfile>structstp__dotsize__t.html</anchorfile>
-      <anchor>1b77e2dff6771aeeb5ebccdc23a04314</anchor>
+      <anchorfile>structstp__dotsize.html</anchorfile>
+      <anchor>8d5273395d0e27004f779de0ea81ff23</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>value</name>
-      <anchorfile>structstp__dotsize__t.html</anchorfile>
-      <anchor>59531e49199b2adacf0944a7ac47359e</anchor>
+      <anchorfile>structstp__dotsize.html</anchorfile>
+      <anchor>d259e8d169a7d140e4964b80790c7ddd</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8113,80 +8726,80 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_family_t</name>
-    <filename>structstp__family__t.html</filename>
+    <name>stp_family</name>
+    <filename>structstp__family.html</filename>
     <member kind="variable">
       <type>const stp_printfuncs_t *</type>
       <name>printfuncs</name>
-      <anchorfile>structstp__family__t.html</anchorfile>
-      <anchor>393a6a8182a6ef2e56ef87ea620ef868</anchor>
+      <anchorfile>structstp__family.html</anchorfile>
+      <anchor>d29f00ba3565e93c138b00e4a48cde77</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_list_t *</type>
       <name>printer_list</name>
-      <anchorfile>structstp__family__t.html</anchorfile>
-      <anchor>8b71d91daeb9b00d7b0ee3fe28509fe7</anchor>
+      <anchorfile>structstp__family.html</anchorfile>
+      <anchor>6e4f0c216f5ced14a819fbacdb26547d</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_image_t</name>
-    <filename>structstp__image__t.html</filename>
+    <name>stp_image</name>
+    <filename>structstp__image.html</filename>
     <member kind="variable">
       <type>void(*</type>
       <name>init</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>96e9c2c9f040fbc66abab45a4b2a79b0</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>ce69bf25344a814cabea38afa4527086</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>reset</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>ce331fd802c9c7c65a6538c03aecc0b3</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>7bb2244368c6b1e07d27afb3dd249ffd</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>width</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>e120f940a46eeb9d8f6a28b03cea88c0</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>890033525988e15f4f4a0b4132e5f19b</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>height</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>687ae4bce9980985adfce7a15af38cde</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>4977ad211581999a3f3290983929cce9</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>stp_image_status_t(*</type>
       <name>get_row</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>d490679a2b158fcec555d54d7e9bc528</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>8f7f8fb5826f52b8bd820f422c583350</anchor>
       <arglist>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</arglist>
     </member>
     <member kind="variable">
       <type>const char *(*</type>
       <name>get_appname</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>c8184c887110641206044785fae3f46d</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>56636ad7c0dbf0a82284241f796d95cd</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>conclude</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>75a8a76ab6d78ba767b21e5ed95827a7</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>5d2385711b303e055258c28f42ab7f4c</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>rep</name>
-      <anchorfile>structstp__image__t.html</anchorfile>
-      <anchor>e5ba3d09714043232aef970d245182ee</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>b18e6ee35037589bf485213022e2d871</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8306,123 +8919,98 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_module_t</name>
-    <filename>structstp__module__t.html</filename>
+    <name>stp_module</name>
+    <filename>structstp__module.html</filename>
     <member kind="variable">
       <type>const char *</type>
       <name>name</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>87a2ab51de6f6860ac0803c0d8114bd7</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>32e2db7046f281afd6748afe111aee76</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>version</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>b5ec864c9d2932872dd2ba62c53ba813</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>e2038239913d3ddbece919082501c8d0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>comment</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>66daab38c5658cdffd0ebd3c68e3b326</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>b60ac536d9ec7b3a306cddf4c06e18bb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_module_class_t</type>
       <name>class</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>1bd300254cbc047d2c00688cd7777aa3</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>4ebc727be1ec8edaaa1b25415a3932e3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>handle</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>f1b13d76a5b44839e773b7ddaf7e73c5</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>1a96aa2db220972e124717cc6dd03c8e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>init</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>12d502ea2386865bc05fd659bebb974f</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>fa7d4259940b8d42a36f14108f504944</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>fini</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>2b0e0c7ba523ac34f6a085a3eaaa33f4</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>e04ff0565f8ebd56b383917b602ffc4a</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>syms</name>
-      <anchorfile>structstp__module__t.html</anchorfile>
-      <anchor>a9ecb04bec44f6348ccb9c86c1330405</anchor>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>0e7297a93920d8f6849718d0a32fa2ba</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_module_version_t</name>
-    <filename>structstp__module__version__t.html</filename>
+    <name>stp_module_version</name>
+    <filename>structstp__module__version.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>major</name>
-      <anchorfile>structstp__module__version__t.html</anchorfile>
-      <anchor>3395d816d8cb9603ae00220ba74b0d94</anchor>
+      <anchorfile>structstp__module__version.html</anchorfile>
+      <anchor>15add43e03d0e1624f40c083fa958692</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>minor</name>
-      <anchorfile>structstp__module__version__t.html</anchorfile>
-      <anchor>616356e2cc969782c10a138dfa06af42</anchor>
+      <anchorfile>structstp__module__version.html</anchorfile>
+      <anchor>eced49a93c5e461fa95f809ad077fced</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_mxml_attr_t</name>
-    <filename>structstp__mxml__attr__t.html</filename>
+    <name>stp_mxml_attr_s</name>
+    <filename>structstp__mxml__attr__s.html</filename>
     <member kind="variable">
       <type>char *</type>
       <name>name</name>
-      <anchorfile>structstp__mxml__attr__t.html</anchorfile>
-      <anchor>37d8a0891b88e9bbc89f873dfb097682</anchor>
+      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
+      <anchor>4ea32ac1f797cf7722bf3e8638b21dee</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>value</name>
-      <anchorfile>structstp__mxml__attr__t.html</anchorfile>
-      <anchor>9a5667da7d27fa347051fe5f80aeca0e</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_mxml_element_t</name>
-    <filename>structstp__mxml__element__t.html</filename>
-    <member kind="variable">
-      <type>char *</type>
-      <name>name</name>
-      <anchorfile>structstp__mxml__element__t.html</anchorfile>
-      <anchor>e678ef57706b8b2a5676612e4d5849c4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>num_attrs</name>
-      <anchorfile>structstp__mxml__element__t.html</anchorfile>
-      <anchor>d016326e925b78b7c6b951f33500184a</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_attr_t *</type>
-      <name>attrs</name>
-      <anchorfile>structstp__mxml__element__t.html</anchorfile>
-      <anchor>347605ee2ec9846e6d9f56a1b80a5901</anchor>
+      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
+      <anchor>25554324bd8ccf8e9558e4705eda0daa</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8480,59 +9068,84 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_mxml_text_t</name>
-    <filename>structstp__mxml__text__t.html</filename>
+    <name>stp_mxml_text_s</name>
+    <filename>structstp__mxml__text__s.html</filename>
     <member kind="variable">
       <type>int</type>
       <name>whitespace</name>
-      <anchorfile>structstp__mxml__text__t.html</anchorfile>
-      <anchor>10493f8ced34febc9dafc554df0a9db8</anchor>
+      <anchorfile>structstp__mxml__text__s.html</anchorfile>
+      <anchor>76bcfbb8c3de4e1c597468d51ef47184</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>string</name>
-      <anchorfile>structstp__mxml__text__t.html</anchorfile>
-      <anchor>82078f046e2331d07df9de1a6d526885</anchor>
+      <anchorfile>structstp__mxml__text__s.html</anchorfile>
+      <anchor>ef1865e8cab7d5ab175c6e67f122be15</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_mxml_value_s</name>
+    <filename>structstp__mxml__value__s.html</filename>
+    <member kind="variable">
+      <type>char *</type>
+      <name>name</name>
+      <anchorfile>structstp__mxml__value__s.html</anchorfile>
+      <anchor>959d5315fd98119aa5d23d2b8d307c58</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>num_attrs</name>
+      <anchorfile>structstp__mxml__value__s.html</anchorfile>
+      <anchor>f29b9bbc769c278dad18ff2cb098ef6a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_attr_t *</type>
+      <name>attrs</name>
+      <anchorfile>structstp__mxml__value__s.html</anchorfile>
+      <anchor>69974b612f59fd3ef1d5db85db2d1a07</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="union">
-    <name>stp_mxml_value_t</name>
-    <filename>unionstp__mxml__value__t.html</filename>
+    <name>stp_mxml_value_u</name>
+    <filename>unionstp__mxml__value__u.html</filename>
     <member kind="variable">
       <type>stp_mxml_element_t</type>
       <name>element</name>
-      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
-      <anchor>96aab65fff9144bb7ac17e525769af31</anchor>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>d4d8442bb433ac3da208e22ff0eaccf7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>integer</name>
-      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
-      <anchor>14551523faecca83828853601e399aee</anchor>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>9540870864c06f2bf901024b7cc9048d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>opaque</name>
-      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
-      <anchor>50776acb8e84f99d12434b8db2d77b2e</anchor>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>ca8f6bf03f29248dee0b8d364454d051</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>real</name>
-      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
-      <anchor>0f60d52af338d4cbdd09b93879e89b1a</anchor>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>3f253397958ad919a1fc97c42a58bc67</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_text_t</type>
       <name>text</name>
-      <anchorfile>unionstp__mxml__value__t.html</anchorfile>
-      <anchor>3f462c7b6567252b1b2fe6eaf029e1cf</anchor>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>82c76c9aca350baca3b72723d0a4e99d</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -8988,27 +9601,27 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stp_shade_t</name>
-    <filename>structstp__shade__t.html</filename>
+    <name>stp_shade</name>
+    <filename>structstp__shade.html</filename>
     <member kind="variable">
       <type>double</type>
       <name>value</name>
-      <anchorfile>structstp__shade__t.html</anchorfile>
-      <anchor>d43f8713d01af090ecb910a8b5538125</anchor>
+      <anchorfile>structstp__shade.html</anchorfile>
+      <anchor>07a72426c7bcbf22f1cc253a97a453d4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>numsizes</name>
-      <anchorfile>structstp__shade__t.html</anchorfile>
-      <anchor>06cdc2392609bb5e0fd731b02ad7dc1b</anchor>
+      <anchorfile>structstp__shade.html</anchorfile>
+      <anchor>8e68774d99e3eecb76f06f7704f1eb90</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_dotsize_t *</type>
       <name>dot_sizes</name>
-      <anchorfile>structstp__shade__t.html</anchorfile>
-      <anchor>7ab08079ac4667939bfebfc1454101e8</anchor>
+      <anchorfile>structstp__shade.html</anchorfile>
+      <anchor>5057a856d4a6f7095af66b8cefc3cdc3</anchor>
       <arglist></arglist>
     </member>
   </compound>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index 5245839..2f96cf6 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -4,60 +4,64 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>libgutenprint API Reference Data Structures</h1>Here are the data structures with brief descriptions:<table>
+<div class="contents">
+<h1>Data Structures</h1>Here are the data structures with brief descriptions:<table>
+  <tr><td class="indexkey"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__color__t.html">stp_color_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__t.html">stp_dither_matrix_generic_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__normal__t.html">stp_dither_matrix_normal_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__short__t.html">stp_dither_matrix_short_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__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__t.html">stp_family_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__image__t.html">stp_image_t</a></td><td class="indexvalue">The image type is an abstract data type for interfacing with the image creation program </td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__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__t.html">stp_module_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__module__version__t.html">stp_module_version_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__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__t.html">stp_mxml_text_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><a class="el" href="structstp__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__t.html">stp_shade_t</a></td><td class="indexvalue"></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>
 </table>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 926b2cd..ac8a11f 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/array.h File Reference</h1><code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/array.h File Reference</h1>Array functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
@@ -57,8 +62,11 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#ge05ba5cfe8c03e2435348d6c5488d87e"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Array functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Array functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index 1d548ab..ffec14a 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/bit-ops.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/bit-ops.h File Reference</h1>Bit operations. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#1a36a9f23f967528df8fffbd71b5e96c">stp_fold</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
@@ -39,7 +44,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Bit operations. <hr><h2>Function Documentation</h2>
+Bit operations. 
+<p>
+<hr><h2>Function Documentation</h2>
 <a class="anchor" name="1a36a9f23f967528df8fffbd71b5e96c"></a><!-- doxytag: member="bit-ops.h::stp_fold" ref="1a36a9f23f967528df8fffbd71b5e96c" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
 <div class="memitem">
 <div class="memproto">
@@ -606,8 +613,9 @@ Bit operations. <hr><h2>Function Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index dcbb486..c34a1e8 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<h1>include/gutenprint/channel.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprint/channel.h File Reference</h1>Channel functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#90026b1db4586b08df148db41a676b50">stp_channel_reset</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
@@ -57,7 +62,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#c5c6578307d574f53c8f9110053fe9c5">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#35b64c052b8dcfd4f1576b10d999e022">stp_channel_initialize</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#35b64c052b8dcfd4f1576b10d999e022">stp_channel_initialize</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#4559ad54f7de2403438baab1c97789f7">stp_channel_convert</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
 
@@ -67,7 +72,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Channel functions. <hr><h2>Function Documentation</h2>
+Channel functions. 
+<p>
+<hr><h2>Function Documentation</h2>
 <a class="anchor" name="f03151796a167ec708b5412a31ddced5"></a><!-- doxytag: member="channel.h::stp_channel_add" ref="f03151796a167ec708b5412a31ddced5" args="(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)" -->
 <div class="memitem">
 <div class="memproto">
@@ -425,7 +432,7 @@ Channel functions. <hr><h2>Function Documentation</h2>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -758,8 +765,9 @@ Channel functions. <hr><h2>Function Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 1f298f8..8048afd 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -4,29 +4,34 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>libgutenprint API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_S">S</a></div><p>
+<div class="contents">
+<h1>Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="structstp__dither__matrix__normal__t.html">stp_dither_matrix_normal_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__short__t.html">stp_dither_matrix_short_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__color__t.html">stp_color_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family__t.html">stp_family_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade__t.html">stp_shade_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image__t.html">stp_image_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__t.html">stp_module_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__version__t.html">stp_module_version_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+<tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__color.html">stp_color</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family.html">stp_family</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image.html">stp_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module.html">stp_module</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 146252a..9e852c9 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -4,57 +4,68 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/color.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/color.h File Reference</h1>Color functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
+
+<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#g68c13c36d723e5604507bf33fe629f8b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#g3b8f62108f3604480e7b89b253527f4a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#g68ba525119da39ae854645ae649557d3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#g612389b45f09358f6bad0e376c91b057"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Color functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Color functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index 68f0edf..a6632c9 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/curve-cache.h File Reference</h1><code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/curve-cache.h File Reference</h1>Curve caching functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
@@ -50,7 +55,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Curve caching functions. <hr><h2>Define Documentation</h2>
+Curve caching functions. 
+<p>
+<hr><h2>Define Documentation</h2>
 <a class="anchor" name="70b70d0328c61f17925402a4b1bb9a90"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="70b70d0328c61f17925402a4b1bb9a90" args="(cache)" -->
 <div class="memitem">
 <div class="memproto">
@@ -339,8 +346,9 @@ Curve caching functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 7e6177a..22b9af7 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/curve.h File Reference</h1><code>#include &lt;stdio.h&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/curve.h File Reference</h1>Curve functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;stdlib.h&gt;</code><br>
 <code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -195,8 +200,11 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#g55c83a9139fc1b06b90e983d7c1ceff7"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Curve functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Curve functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index 87b8b63..e932e76 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -4,17 +4,20 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1><a class="anchor" name="deprecated">Deprecated List</a></h1><a class="anchor" name="_deprecated000001"></a> <dl>
+<div class="contents">
+<h1><a class="anchor" name="deprecated">Deprecated List </a></h1><a class="anchor" name="_deprecated000001"></a> <dl>
 <dt>Global <a class="el" href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a>  </dt>
 <dd>There should never be any need to use this function. </dd>
 </dl>
@@ -23,8 +26,9 @@
 <dt>Global <a class="el" href="group__vars.html#g086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a>  </dt>
 <dd>This is likely to go away. </dd>
 </dl>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 97256dc..fb49a3b 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -4,30 +4,35 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<h1>include/gutenprint/dither.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprint/dither.h File Reference</h1>Dither functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html">stp_dither_matrix_short_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html">stp_dither_matrix_normal_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html">stp_dotsize</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade__t.html">stp_shade_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html">stp_shade</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9da4fbd724d498250c7129ccbb88c9a3">STP_ECOLOR_K</a>&nbsp;&nbsp;&nbsp;0</td></tr>
@@ -40,28 +45,44 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#bda31f8e7a9e473057644a5fe4a2339b">STP_NCOLORS</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
 
+<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9a2c54a4730e2c9bb25cf95f6cd3e597">stp_dither_matrix_short_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#febf0484e151cf3cce4ef0b9911d0022">stp_dither_matrix_normal_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
+<a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9f5f63d4f792df1d7becccf3fb5c8fdd">stp_dither_matrix_generic_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a></td></tr>
+
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#36691189c1f859d82675f32f5046e674">stp_dither_matrix_iterated_init</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#36691189c1f859d82675f32f5046e674">stp_dither_matrix_iterated_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#df8bb5a54d552846dcf4d1534d612b65">stp_dither_matrix_shear</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#df8bb5a54d552846dcf4d1534d612b65">stp_dither_matrix_shear</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#2c42ec7156263c024ea6f51ab3b17530">stp_dither_matrix_init</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#2c42ec7156263c024ea6f51ab3b17530">stp_dither_matrix_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#588103d2a828a6c5f51577a917b09cdf">stp_dither_matrix_init_short</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#588103d2a828a6c5f51577a917b09cdf">stp_dither_matrix_init_short</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ad322d923e2d9c3141cc50863d627b25">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#53b7ba7fd141db6ef43c68a6f500bda2">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#53b7ba7fd141db6ef43c68a6f500bda2">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#49ff7bd6b10cd34f9164b4414adbb87c">stp_dither_matrix_destroy</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#49ff7bd6b10cd34f9164b4414adbb87c">stp_dither_matrix_destroy</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#d0dfe2800ed318431a0a54c1ed7d383b">stp_dither_matrix_clone</a> (const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#d0dfe2800ed318431a0a54c1ed7d383b">stp_dither_matrix_clone</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#3ea3c72ff26afef246873edc0bc542d3">stp_dither_matrix_copy</a> (const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#3ea3c72ff26afef246873edc0bc542d3">stp_dither_matrix_copy</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a62e8e672a125150074ea9bddb474423">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a62e8e672a125150074ea9bddb474423">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6ca0a88b0bef517cc1909fb7074e8ac">stp_dither_matrix_set_row</a> (<a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6ca0a88b0bef517cc1909fb7074e8ac">stp_dither_matrix_set_row</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#c523d1ba539398308a7ea83f4188d6ae">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
 
@@ -69,11 +90,11 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f1c4669d2bed56e2e1403a7d0f36f6ba">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9835738585d6a9053eaeacdca25d0fe6">stp_dither_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9835738585d6a9053eaeacdca25d0fe6">stp_dither_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#57aecb702251a2e18848b02109521aed">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a973f651768626a6eb7ab9ad4ce09b2c">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a973f651768626a6eb7ab9ad4ce09b2c">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#3155913bdc63c0545786fc427ca2396a">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
 
@@ -91,7 +112,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#4dd13ea23fe601571d864eabae4b0c40">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f5822743e380d0d51a397dcb3eb6247c">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade__t.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f5822743e380d0d51a397dcb3eb6247c">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#5b8786ffa17dcc1604521b1d1cc5a3a5">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
 
@@ -105,7 +126,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Dither functions. <hr><h2>Define Documentation</h2>
+Dither functions. 
+<p>
+<hr><h2>Define Documentation</h2>
 <a class="anchor" name="fb855574a9dd1ce3c0ac8e353917cf40"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="fb855574a9dd1ce3c0ac8e353917cf40" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -181,6 +204,97 @@ Dither functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
+<hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="9f5f63d4f792df1d7becccf3fb5c8fdd"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="9f5f63d4f792df1d7becccf3fb5c8fdd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>  <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f823fed10cb9591c0e659033ec49f55f"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="f823fed10cb9591c0e659033ec49f55f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>  <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="febf0484e151cf3cce4ef0b9911d0022"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="febf0484e151cf3cce4ef0b9911d0022" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>  <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="9a2c54a4730e2c9bb25cf95f6cd3e597"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="9a2c54a4730e2c9bb25cf95f6cd3e597" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>  <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="7a74b9371fd47b48d961d2316e2126e4"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="7a74b9371fd47b48d961d2316e2126e4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>  <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="5baefb325bf92b7ca10c2d057c04b835"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="5baefb325bf92b7ca10c2d057c04b835" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>  <a class="el" href="structstp__shade.html">stp_shade_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
 <a class="anchor" name="0a470a9c9daef26e90bdb890479a7f87"></a><!-- doxytag: member="dither.h::stp_dither" ref="0a470a9c9daef26e90bdb890479a7f87" args="(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)" -->
 <div class="memitem">
@@ -423,7 +537,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -537,13 +651,13 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_clone           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>src</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
@@ -578,13 +692,13 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_copy           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>src</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>dest</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -607,7 +721,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_destroy           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -627,7 +741,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_init           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -680,7 +794,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_init_from_dither_array           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -715,7 +829,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_init_short           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -768,7 +882,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_iterated_init           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -809,7 +923,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_scale_exponentially           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -838,7 +952,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_set_row           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -867,7 +981,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="memname">void stp_dither_matrix_shear           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__dither__matrix__impl__t.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -1063,7 +1177,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="structstp__shade__t.html">stp_shade_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structstp__shade.html">stp_shade_t</a> *&nbsp;</td>
           <td class="paramname"> <em>shades</em>, </td>
         </tr>
         <tr>
@@ -1216,7 +1330,7 @@ Dither functions. <hr><h2>Define Documentation</h2>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="structstp__dither__matrix__generic__t.html">stp_dither_matrix_generic_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
@@ -1378,8 +1492,9 @@ Dither functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css
index c7db1a8..74c22a2 100644
--- a/doc/gutenprint/html/doxygen.css
+++ b/doc/gutenprint/html/doxygen.css
@@ -2,19 +2,21 @@ BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
 	font-family: Geneva, Arial, Helvetica, sans-serif;
 }
 BODY,TD {
-       font-size: 90%;
+	font-size: 90%;
 }
 H1 {
 	text-align: center;
-       font-size: 160%;
+	font-size: 160%;
 }
 H2 {
-       font-size: 120%;
+	font-size: 120%;
 }
 H3 {
-       font-size: 100%;
+	font-size: 100%;
+}
+CAPTION { 
+	font-weight: bold 
 }
-CAPTION { font-weight: bold }
 DIV.qindex {
 	width: 100%;
 	background-color: #e8eef2;
@@ -24,7 +26,7 @@ DIV.qindex {
 	padding: 2px;
 	line-height: 140%;
 }
-DIV.nav {
+DIV.navpath {
 	width: 100%;
 	background-color: #e8eef2;
 	border: 1px solid #84b0c7;
@@ -70,15 +72,43 @@ A.qindexHL:hover {
 	background-color: #6666cc;
 	color: #ffffff;
 }
-A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
-A.el { text-decoration: none; font-weight: bold }
-A.elRef { font-weight: bold }
-A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}
-A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}
-A.codeRef:link { font-weight: normal; color: #0000FF}
-A.codeRef:visited { font-weight: normal; color: #0000FF}
-A:hover { text-decoration: none; background-color: #f2f2ff }
-DL.el { margin-left: -1cm }
+A.qindexHL:visited { 
+	text-decoration: none; 
+	background-color: #6666cc; 
+	color: #ffffff 
+}
+A.el { 
+	text-decoration: none; 
+	font-weight: bold 
+}
+A.elRef { 
+	font-weight: bold 
+}
+A.code:link { 
+	text-decoration: none; 
+	font-weight: normal; 
+	color: #0000FF
+}
+A.code:visited { 
+	text-decoration: none; 
+	font-weight: normal; 
+	color: #0000FF
+}
+A.codeRef:link { 
+	font-weight: normal; 
+	color: #0000FF
+}
+A.codeRef:visited { 
+	font-weight: normal; 
+	color: #0000FF
+}
+A:hover { 
+	text-decoration: none; 	
+	background-color: #f2f2ff 
+}
+DL.el { 
+	margin-left: -1cm 
+}
 .fragment {
        font-family: monospace, fixed;
        font-size: 95%;
@@ -95,7 +125,13 @@ PRE.fragment {
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
-DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
+DIV.ah { 
+	background-color: black; 
+	font-weight: bold; 
+	color: #ffffff; 
+	margin-bottom: 3px; 
+	margin-top: 3px 
+}
 
 DIV.groupHeader {
        margin-left: 16px;
@@ -103,7 +139,11 @@ DIV.groupHeader {
        margin-bottom: 6px;
        font-weight: bold;
 }
-DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% }
+DIV.groupText { 
+	margin-left: 16px; 
+	font-style: italic; 
+	font-size: 90% 
+}
 BODY {
 	background: white;
 	color: black;
@@ -137,11 +177,16 @@ TD.indexvalue {
 	border: 1px solid #CCCCCC;
 }
 TR.memlist {
-   background-color: #f0f0f0; 
+	background-color: #f0f0f0; 
+}
+P.formulaDsp { 
+	text-align: center; 
+}
+IMG.formulaDsp {
+}
+IMG.formulaInl { 
+	vertical-align: middle; 
 }
-P.formulaDsp { text-align: center; }
-IMG.formulaDsp { }
-IMG.formulaInl { vertical-align: middle; }
 SPAN.keyword       { color: #008000 }
 SPAN.keywordtype   { color: #604020 }
 SPAN.keywordflow   { color: #e08000 }
@@ -149,8 +194,13 @@ SPAN.comment       { color: #800000 }
 SPAN.preprocessor  { color: #806020 }
 SPAN.stringliteral { color: #002080 }
 SPAN.charliteral   { color: #008080 }
+SPAN.vhdldigit     { color: #ff00ff }
+SPAN.vhdlchar      { color: #000000 }
+SPAN.vhdlkeyword   { color: #700070 }
+SPAN.vhdllogic     { color: #ff0000 }
+
 .mdescLeft {
-       padding: 0px 8px 4px 8px;
+	padding: 0px 8px 4px 8px;
 	font-size: 80%;
 	font-style: italic;
 	background-color: #FAFAFA;
@@ -161,7 +211,7 @@ SPAN.charliteral   { color: #008080 }
 	margin: 0px;
 }
 .mdescRight {
-       padding: 0px 8px 4px 8px;
+        padding: 0px 8px 4px 8px;
 	font-size: 80%;
 	font-style: italic;
 	background-color: #FAFAFA;
@@ -258,23 +308,26 @@ SPAN.charliteral   { color: #008080 }
 	border-right-style: none;
 	border-bottom-style: none;
 	border-left-style: none;
-       color: #606060;
+	color: #606060;
 	background-color: #FAFAFA;
 	font-size: 80%;
 }
-.search     { color: #003399;
-              font-weight: bold;
+.search { 
+	color: #003399;
+	font-weight: bold;
 }
 FORM.search {
-              margin-bottom: 0px;
-              margin-top: 0px;
+	margin-bottom: 0px;
+	margin-top: 0px;
 }
-INPUT.search { font-size: 75%;
-               color: #000080;
-               font-weight: normal;
-               background-color: #e8eef2;
+INPUT.search { 
+	font-size: 75%;
+	color: #000080;
+	font-weight: normal;
+	background-color: #e8eef2;
 }
-TD.tiny      { font-size: 75%;
+TD.tiny { 
+	font-size: 75%;
 }
 a {
 	color: #1A41A8;
@@ -282,66 +335,70 @@ a {
 a:visited {
 	color: #2A3798;
 }
-.dirtab { padding: 4px;
-          border-collapse: collapse;
-          border: 1px solid #84b0c7;
+.dirtab { 
+	padding: 4px;
+	border-collapse: collapse;
+	border: 1px solid #84b0c7;
 }
-TH.dirtab { background: #e8eef2;
-            font-weight: bold;
+TH.dirtab { 
+	background: #e8eef2;
+	font-weight: bold;
 }
-HR { height: 1px;
-     border: none;
-     border-top: 1px solid black;
+HR { 
+	height: 1px;
+	border: none;
+	border-top: 1px solid black;
 }
 
 /* Style for detailed member documentation */
 .memtemplate {
-  font-size: 80%;
-  color: #606060;
-  font-weight: normal;
+	font-size: 80%;
+	color: #606060;
+	font-weight: normal;
+	margin-left: 3px;
 } 
 .memnav { 
-  background-color: #e8eef2;
-  border: 1px solid #84b0c7;
-  text-align: center;
-  margin: 2px;
-  margin-right: 15px;
-  padding: 2px;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
+	text-align: center;
+	margin: 2px;
+	margin-right: 15px;
+	padding: 2px;
 }
 .memitem {
-  padding: 4px;
-  background-color: #eef3f5;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #dedeee;
-  -moz-border-radius: 8px 8px 8px 8px;
+	padding: 4px;
+	background-color: #eef3f5;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #dedeee;
+	-moz-border-radius: 8px 8px 8px 8px;
 }
 .memname {
-  white-space: nowrap;
-  font-weight: bold;
+	white-space: nowrap;
+	font-weight: bold;
 }
 .memdoc{
-  padding-left: 10px;
+	padding-left: 10px;
 }
 .memproto {
-  background-color: #d5e1e8;
-  width: 100%;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #84b0c7;
-  font-weight: bold;
-  -moz-border-radius: 8px 8px 8px 8px;
+	background-color: #d5e1e8;
+	width: 100%;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #84b0c7;
+	font-weight: bold;
+	-moz-border-radius: 8px 8px 8px 8px;
 }
 .paramkey {
-  text-align: right;
+	text-align: right;
 }
 .paramtype {
-  white-space: nowrap;
+	white-space: nowrap;
 }
 .paramname {
-  color: #602020;
-  font-style: italic;
-  white-space: nowrap;
+	color: #602020;
+	font-style: italic;
+	white-space: nowrap;
 }
 /* End Styling for detailed member documentation */
 
@@ -350,9 +407,27 @@ HR { height: 1px;
 	font-family: sans-serif;
 	margin:0.5em;
 }
-.directory { font-size: 9pt; font-weight: bold; }
-.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
-.directory > h3 { margin-top: 0; }
-.directory p { margin: 0px; white-space: nowrap; }
-.directory div { display: none; margin: 0px; }
-.directory img { vertical-align: -30%; }
+.directory { 
+	font-size: 9pt; 
+	font-weight: bold; 
+}
+.directory h3 { 
+	margin: 0px; 
+	margin-top: 1em; 
+	font-size: 11pt; 
+}
+.directory > h3 { 
+	margin-top: 0; 
+}
+.directory p { 
+	margin: 0px; 
+	white-space: nowrap; 
+}
+.directory div { 
+	display: none; 
+	margin: 0px; 
+}
+.directory img { 
+	vertical-align: -30%; 
+}
+
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 5aad9f0..7795832 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -4,51 +4,55 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<h1>libgutenprint API Reference File List</h1>Here is a list of all files with brief descriptions:<table>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="array_8h.html">array.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="bit-ops_8h.html">bit-ops.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="channel_8h.html">channel.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="color_8h.html">color.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint_8h.html">gutenprint.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="image_8h.html">image.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="list_8h.html">list.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="module_8h.html">module.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="path_8h.html">path.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="sequence_8h.html">sequence.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="util_8h.html">util.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue"></td></tr>
+<div class="contents">
+<h1>File List</h1>Here is a list of all files with brief descriptions:<table>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="array_8h.html">array.h</a></td><td class="indexvalue">Array functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="bit-ops_8h.html">bit-ops.h</a></td><td class="indexvalue">Bit operations </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="channel_8h.html">channel.h</a></td><td class="indexvalue">Channel functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="color_8h.html">color.h</a></td><td class="indexvalue">Color functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></td><td class="indexvalue">Curve caching functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue">Curve functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></td><td class="indexvalue">Dither functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td><td class="indexvalue">Internationalisation functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td><td class="indexvalue">Internationalisation functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td><td class="indexvalue">Gutenprint module header </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td><td class="indexvalue">Version functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint_8h.html">gutenprint.h</a></td><td class="indexvalue">Gutenprint master header </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="image_8h.html">image.h</a></td><td class="indexvalue">Image functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="list_8h.html">list.h</a></td><td class="indexvalue">Generic list functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="module_8h.html">module.h</a></td><td class="indexvalue">Module functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></td><td class="indexvalue">Mini-XML XML parsing functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></td><td class="indexvalue">Paper size functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="path_8h.html">path.h</a></td><td class="indexvalue">Simple directory path functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></td><td class="indexvalue">Printer functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="sequence_8h.html">sequence.h</a></td><td class="indexvalue">Sequence functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></td><td class="indexvalue">String list functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="util_8h.html">util.h</a></td><td class="indexvalue">Utility functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></td><td class="indexvalue">Print job functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue">Softweave functions </td></tr>
+  <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue">XML tree functions </td></tr>
 </table>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index c8a491c..a7464be 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -4,71 +4,74 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="functions.html"><span>All</span></a></li>
-    <li><a href="functions_vars.html"><span>Variables</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index_a"><span>a</span></a></li>
-    <li><a href="#index_b"><span>b</span></a></li>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_d"><span>d</span></a></li>
-    <li><a href="#index_e"><span>e</span></a></li>
-    <li><a href="#index_f"><span>f</span></a></li>
-    <li><a href="#index_g"><span>g</span></a></li>
-    <li><a href="#index_h"><span>h</span></a></li>
-    <li><a href="#index_i"><span>i</span></a></li>
-    <li><a href="#index_j"><span>j</span></a></li>
-    <li><a href="#index_l"><span>l</span></a></li>
-    <li><a href="#index_m"><span>m</span></a></li>
-    <li><a href="#index_n"><span>n</span></a></li>
-    <li><a href="#index_o"><span>o</span></a></li>
-    <li><a href="#index_p"><span>p</span></a></li>
-    <li><a href="#index_r"><span>r</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-    <li><a href="#index_t"><span>t</span></a></li>
-    <li><a href="#index_u"><span>u</span></a></li>
-    <li><a href="#index_v"><span>v</span></a></li>
-    <li><a href="#index_w"><span>w</span></a></li>
-    <li><a href="#index_x"><span>x</span></a></li>
-    <li><a href="#index_y"><span>y</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="functions.html"><span>All</span></a></li>
+      <li><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_b"><span>b</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_f"><span>f</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_h"><span>h</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_j"><span>j</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+      <li><a href="#index_v"><span>v</span></a></li>
+      <li><a href="#index_w"><span>w</span></a></li>
+      <li><a href="#index_x"><span>x</span></a></li>
+      <li><a href="#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
 : <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t</a>
 <li>attrs
-: <a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">stp_mxml_element_t</a>
+: <a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s</a>
 </ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl</a>
 <li>bit_pattern
-: <a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">stp_dotsize_t</a>
+: <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize</a>
 <li>boolean
 : <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t</a>
 <li>bottom
@@ -76,10 +79,10 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>bounds
 : <a class="el" href="structstp__parameter__t.html#bb297424036e868212f5086d5c5235fe">stp_parameter_t</a>
 <li>bytes
-: <a class="el" href="structstp__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">stp_dither_matrix_normal_t</a>
+: <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal</a>
 , <a class="el" href="structstp__raw__t.html#5e4620104d47e7e593d75d1ebc977407">stp_raw_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short</a>
 </ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
@@ -89,14 +92,14 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>child
 : <a class="el" href="structstp__mxml__node__s.html#44550ea8d68a483ccc130c58b66ddd33">stp_mxml_node_s</a>
 <li>class
-: <a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">stp_module_t</a>
+: <a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">stp_module</a>
 <li>colorfuncs
-: <a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">stp_color_t</a>
+: <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
 <li>comment
-: <a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">stp_module_t</a>
+: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
 , <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
 <li>conclude
-: <a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">stp_image_t</a>
+: <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image</a>
 <li>count
 : <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t</a>
 <li>curve
@@ -107,10 +110,10 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>d_cache
 : <a class="el" href="structstp__cached__curve__t.html#59c26647178724471f383dea6e85f8ae">stp_cached_curve_t</a>
 <li>data
-: <a class="el" href="structstp__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">stp_dither_matrix_short_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">stp_dither_matrix_generic_t</a>
+: <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic</a>
 , <a class="el" href="structstp__raw__t.html#36151f67569592aeac5c549a2a0daa2a">stp_raw_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal</a>
 <li>dbl
 : <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t</a>
 <li>deflt
@@ -124,56 +127,56 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>dimension
 : <a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">stp_parameter_t</a>
 <li>dot_sizes
-: <a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">stp_shade_t</a>
+: <a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">stp_shade</a>
 </ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u</a>
 <li>end_job
 : <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t</a>
 <li>end_pos
 : <a class="el" href="structstp__linebounds__t.html#9bc2a60779ccf4ac3d90d47441e883ab">stp_linebounds_t</a>
 <li>exp
-: <a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl</a>
 </ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl</a>
 <li>fini
-: <a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">stp_module_t</a>
+: <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module</a>
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">stp_image_t</a>
+: <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image</a>
 <li>get_external_options
 : <a class="el" href="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">stp_printfuncs_t</a>
 <li>get_row
 : <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t</a>
-, <a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">stp_image_t</a>
+, <a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">stp_image</a>
 </ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">stp_module_t</a>
+: <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module</a>
 <li>height
-: <a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">stp_image_t</a>
+: <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image</a>
 , <a class="el" href="structstp__papersize__t.html#040d59e39abdef9b12c929734fb7a08c">stp_papersize_t</a>
 <li>help
 : <a class="el" href="structstp__parameter__t.html#9f0637d6b97f0daa3122840eb2bd13db">stp_parameter_t</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>i_own
-: <a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl</a>
 <li>imageable_area
 : <a class="el" href="structstp__printfuncs__t.html#68c9339cc1b74382ec07eed78c2bd501">stp_printfuncs_t</a>
 <li>index
-: <a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl</a>
 <li>init
 : <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t</a>
-, <a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">stp_image_t</a>
-, <a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">stp_module_t</a>
+, <a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">stp_image</a>
+, <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module</a>
 <li>integer
 : <a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t</a>
-, <a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">stp_mxml_value_t</a>
+, <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u</a>
 <li>is_active
 : <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t</a>
 <li>is_mandatory
@@ -187,13 +190,13 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>last_child
 : <a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">stp_mxml_node_s</a>
 <li>last_x
-: <a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl</a>
 <li>last_x_mod
-: <a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl</a>
 <li>last_y
-: <a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl</a>
 <li>last_y_mod
-: <a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl</a>
 <li>left
 : <a class="el" href="structstp__papersize__t.html#9ceb7ef01ea56c990eddbef4140b34a0">stp_papersize_t</a>
 <li>limit
@@ -205,33 +208,33 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstp__weave__t.html#1e50ffa910d33a365572ceb93f0197c6">stp_weave_t</a>
 , <a class="el" href="structstp__pass__t.html#e93d9d32f282f62426160626ff6c5ca3">stp_pass_t</a>
 <li>long_name
-: <a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">stp_color_t</a>
+: <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color</a>
 <li>lower
 : <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t</a>
 , <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_bound_t</a>
 </ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">stp_module_version_t</a>
+: <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version</a>
 <li>matrix
-: <a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl</a>
 <li>maximum_imageable_area
 : <a class="el" href="structstp__printfuncs__t.html#3661a4612e62e8e5aef31eaab345675c">stp_printfuncs_t</a>
 <li>media_size
 : <a class="el" href="structstp__printfuncs__t.html#102e995ff1ce583f84e38409852bf95f">stp_printfuncs_t</a>
 <li>minor
-: <a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">stp_module_version_t</a>
+: <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version</a>
 <li>missingstartrows
 : <a class="el" href="structstp__weave__t.html#f60b909adb3f9efb541be500c08cf87e">stp_weave_t</a>
 , <a class="el" href="structstp__pass__t.html#462d1714bab638212fcae32b869c11d2">stp_pass_t</a>
 </ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstp__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">stp_module_t</a>
-, <a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">stp_mxml_attr_t</a>
+: <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module</a>
+, <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s</a>
 , <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t</a>
 , <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t</a>
-, <a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">stp_mxml_element_t</a>
+, <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s</a>
 , <a class="el" href="structstp__parameter__t.html#092430e582e7560fb532f546f78ca70c">stp_parameter_t</a>
 <li>ncolors
 : <a class="el" href="structstp__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t</a>
@@ -242,13 +245,13 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>next
 : <a class="el" href="structstp__mxml__node__s.html#8831071db5a4b4df95ea3c5c2e95476b">stp_mxml_node_s</a>
 <li>num_attrs
-: <a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">stp_mxml_element_t</a>
+: <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s</a>
 <li>numsizes
-: <a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">stp_shade_t</a>
+: <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade</a>
 </ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u</a>
 </ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
@@ -275,27 +278,27 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t</a>
 , <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_t</a>
 <li>prescaled
-: <a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">stp_dither_matrix_normal_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">stp_dither_matrix_short_t</a>
+: <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short</a>
 <li>prev
 : <a class="el" href="structstp__mxml__node__s.html#2174125dc205e7c760e4e8c9c9048ddf">stp_mxml_node_s</a>
 <li>print
 : <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t</a>
 <li>printer_list
-: <a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">stp_family_t</a>
+: <a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">stp_family</a>
 <li>printfuncs
-: <a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">stp_family_t</a>
+: <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family</a>
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
 : <a class="el" href="structstp__parameter__t.html#4421135f9985be49d156cbc9aa74c710">stp_parameter_t</a>
 <li>real
-: <a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u</a>
 <li>rep
-: <a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">stp_image_t</a>
+: <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image</a>
 <li>reset
-: <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">stp_image_t</a>
+: <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image</a>
 <li>right
 : <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t</a>
 <li>row
@@ -305,7 +308,7 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>s_cache
 : <a class="el" href="structstp__cached__curve__t.html#c55d549f6d2f567ba84ecb9e0417f074">stp_cached_curve_t</a>
 <li>short_name
-: <a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">stp_color_t</a>
+: <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color</a>
 <li>start_job
 : <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t</a>
 <li>start_pos
@@ -313,22 +316,22 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>str
 : <a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">stp_parameter_t</a>
 <li>string
-: <a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">stp_mxml_text_t</a>
+: <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s</a>
 <li>subpass
 : <a class="el" href="structstp__pass__t.html#a4a3363d8de9121ba3d8bf28076b1c89">stp_pass_t</a>
 <li>syms
-: <a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">stp_module_t</a>
+: <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module</a>
 </ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <a class="el" href="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u</a>
 , <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t</a>
 , <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_t</a>
 , <a class="el" href="structstp__param__string__t.html#db032e80e118c233adb9f27544920bd1">stp_param_string_t</a>
 <li>top
 : <a class="el" href="structstp__papersize__t.html#7fc8acdb1d905d6ca4a0b9b247a6c48e">stp_papersize_t</a>
 <li>total_size
-: <a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl</a>
 <li>type
 : <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s</a>
 </ul>
@@ -345,47 +348,48 @@ Here is a list of all struct and union fields with links to the structures/union
 , <a class="el" href="structstp__linecount__t.html#2164f4045d892c45105f5780c80489a4">stp_linecount_t</a>
 <li>value
 : <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s</a>
-, <a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">stp_mxml_attr_t</a>
-, <a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">stp_dotsize_t</a>
-, <a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">stp_shade_t</a>
+, <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s</a>
+, <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize</a>
+, <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade</a>
 <li>verify
 : <a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">stp_printfuncs_t</a>
 <li>verify_this_parameter
 : <a class="el" href="structstp__parameter__t.html#56100203c262c60d4cb18c7a49cde27d">stp_parameter_t</a>
 <li>version
-: <a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">stp_module_t</a>
+: <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module</a>
 </ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">stp_mxml_text_t</a>
+: <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s</a>
 <li>width
 : <a class="el" href="structstp__papersize__t.html#edcca3776ddeb5ed815df3aa112147dd">stp_papersize_t</a>
-, <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">stp_image_t</a>
+, <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">stp_image</a>
 </ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
 : <a class="el" href="structstp__curve__point__t.html#92b13b94109b1270563a1116dc19b926">stp_curve_point_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">stp_dither_matrix_short_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal</a>
 <li>x_offset
-: <a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl</a>
 <li>x_size
-: <a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl</a>
 </ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
 : <a class="el" href="structstp__curve__point__t.html#132b1e8be20525667ece971d02f60b9d">stp_curve_point_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">stp_dither_matrix_short_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal</a>
 <li>y_offset
-: <a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl</a>
 <li>y_size
-: <a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index ab6d80d..a887e42 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -4,71 +4,74 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="functions.html"><span>All</span></a></li>
-    <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index_a"><span>a</span></a></li>
-    <li><a href="#index_b"><span>b</span></a></li>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_d"><span>d</span></a></li>
-    <li><a href="#index_e"><span>e</span></a></li>
-    <li><a href="#index_f"><span>f</span></a></li>
-    <li><a href="#index_g"><span>g</span></a></li>
-    <li><a href="#index_h"><span>h</span></a></li>
-    <li><a href="#index_i"><span>i</span></a></li>
-    <li><a href="#index_j"><span>j</span></a></li>
-    <li><a href="#index_l"><span>l</span></a></li>
-    <li><a href="#index_m"><span>m</span></a></li>
-    <li><a href="#index_n"><span>n</span></a></li>
-    <li><a href="#index_o"><span>o</span></a></li>
-    <li><a href="#index_p"><span>p</span></a></li>
-    <li><a href="#index_r"><span>r</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-    <li><a href="#index_t"><span>t</span></a></li>
-    <li><a href="#index_u"><span>u</span></a></li>
-    <li><a href="#index_v"><span>v</span></a></li>
-    <li><a href="#index_w"><span>w</span></a></li>
-    <li><a href="#index_x"><span>x</span></a></li>
-    <li><a href="#index_y"><span>y</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="functions.html"><span>All</span></a></li>
+      <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_b"><span>b</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_f"><span>f</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_h"><span>h</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_j"><span>j</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+      <li><a href="#index_v"><span>v</span></a></li>
+      <li><a href="#index_w"><span>w</span></a></li>
+      <li><a href="#index_x"><span>x</span></a></li>
+      <li><a href="#index_y"><span>y</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
 : <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t</a>
 <li>attrs
-: <a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">stp_mxml_element_t</a>
+: <a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s</a>
 </ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl</a>
 <li>bit_pattern
-: <a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">stp_dotsize_t</a>
+: <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize</a>
 <li>boolean
 : <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t</a>
 <li>bottom
@@ -76,10 +79,10 @@
 <li>bounds
 : <a class="el" href="structstp__parameter__t.html#bb297424036e868212f5086d5c5235fe">stp_parameter_t</a>
 <li>bytes
-: <a class="el" href="structstp__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">stp_dither_matrix_normal_t</a>
+: <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal</a>
 , <a class="el" href="structstp__raw__t.html#5e4620104d47e7e593d75d1ebc977407">stp_raw_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">stp_dither_matrix_short_t</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short</a>
 </ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
@@ -89,14 +92,14 @@
 <li>child
 : <a class="el" href="structstp__mxml__node__s.html#44550ea8d68a483ccc130c58b66ddd33">stp_mxml_node_s</a>
 <li>class
-: <a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">stp_module_t</a>
+: <a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">stp_module</a>
 <li>colorfuncs
-: <a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">stp_color_t</a>
+: <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
 <li>comment
-: <a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">stp_module_t</a>
+: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
 , <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
 <li>conclude
-: <a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">stp_image_t</a>
+: <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image</a>
 <li>count
 : <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t</a>
 <li>curve
@@ -107,10 +110,10 @@
 <li>d_cache
 : <a class="el" href="structstp__cached__curve__t.html#59c26647178724471f383dea6e85f8ae">stp_cached_curve_t</a>
 <li>data
-: <a class="el" href="structstp__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">stp_dither_matrix_short_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">stp_dither_matrix_generic_t</a>
+: <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic</a>
 , <a class="el" href="structstp__raw__t.html#36151f67569592aeac5c549a2a0daa2a">stp_raw_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal</a>
 <li>dbl
 : <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t</a>
 <li>deflt
@@ -124,56 +127,56 @@
 <li>dimension
 : <a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">stp_parameter_t</a>
 <li>dot_sizes
-: <a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">stp_shade_t</a>
+: <a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">stp_shade</a>
 </ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u</a>
 <li>end_job
 : <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t</a>
 <li>end_pos
 : <a class="el" href="structstp__linebounds__t.html#9bc2a60779ccf4ac3d90d47441e883ab">stp_linebounds_t</a>
 <li>exp
-: <a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl</a>
 </ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl</a>
 <li>fini
-: <a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">stp_module_t</a>
+: <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module</a>
 </ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">stp_image_t</a>
+: <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image</a>
 <li>get_external_options
 : <a class="el" href="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">stp_printfuncs_t</a>
 <li>get_row
 : <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t</a>
-, <a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">stp_image_t</a>
+, <a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">stp_image</a>
 </ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">stp_module_t</a>
+: <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module</a>
 <li>height
-: <a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">stp_image_t</a>
+: <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image</a>
 , <a class="el" href="structstp__papersize__t.html#040d59e39abdef9b12c929734fb7a08c">stp_papersize_t</a>
 <li>help
 : <a class="el" href="structstp__parameter__t.html#9f0637d6b97f0daa3122840eb2bd13db">stp_parameter_t</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>i_own
-: <a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl</a>
 <li>imageable_area
 : <a class="el" href="structstp__printfuncs__t.html#68c9339cc1b74382ec07eed78c2bd501">stp_printfuncs_t</a>
 <li>index
-: <a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl</a>
 <li>init
 : <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t</a>
-, <a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">stp_image_t</a>
-, <a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">stp_module_t</a>
+, <a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">stp_image</a>
+, <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module</a>
 <li>integer
 : <a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t</a>
-, <a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">stp_mxml_value_t</a>
+, <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u</a>
 <li>is_active
 : <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t</a>
 <li>is_mandatory
@@ -187,13 +190,13 @@
 <li>last_child
 : <a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">stp_mxml_node_s</a>
 <li>last_x
-: <a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl</a>
 <li>last_x_mod
-: <a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl</a>
 <li>last_y
-: <a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl</a>
 <li>last_y_mod
-: <a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl</a>
 <li>left
 : <a class="el" href="structstp__papersize__t.html#9ceb7ef01ea56c990eddbef4140b34a0">stp_papersize_t</a>
 <li>limit
@@ -205,33 +208,33 @@
 : <a class="el" href="structstp__weave__t.html#1e50ffa910d33a365572ceb93f0197c6">stp_weave_t</a>
 , <a class="el" href="structstp__pass__t.html#e93d9d32f282f62426160626ff6c5ca3">stp_pass_t</a>
 <li>long_name
-: <a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">stp_color_t</a>
+: <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color</a>
 <li>lower
 : <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t</a>
 , <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_bound_t</a>
 </ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">stp_module_version_t</a>
+: <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version</a>
 <li>matrix
-: <a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl</a>
 <li>maximum_imageable_area
 : <a class="el" href="structstp__printfuncs__t.html#3661a4612e62e8e5aef31eaab345675c">stp_printfuncs_t</a>
 <li>media_size
 : <a class="el" href="structstp__printfuncs__t.html#102e995ff1ce583f84e38409852bf95f">stp_printfuncs_t</a>
 <li>minor
-: <a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">stp_module_version_t</a>
+: <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version</a>
 <li>missingstartrows
 : <a class="el" href="structstp__weave__t.html#f60b909adb3f9efb541be500c08cf87e">stp_weave_t</a>
 , <a class="el" href="structstp__pass__t.html#462d1714bab638212fcae32b869c11d2">stp_pass_t</a>
 </ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstp__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">stp_module_t</a>
-, <a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">stp_mxml_attr_t</a>
+: <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module</a>
+, <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s</a>
 , <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t</a>
 , <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t</a>
-, <a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">stp_mxml_element_t</a>
+, <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s</a>
 , <a class="el" href="structstp__parameter__t.html#092430e582e7560fb532f546f78ca70c">stp_parameter_t</a>
 <li>ncolors
 : <a class="el" href="structstp__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t</a>
@@ -242,13 +245,13 @@
 <li>next
 : <a class="el" href="structstp__mxml__node__s.html#8831071db5a4b4df95ea3c5c2e95476b">stp_mxml_node_s</a>
 <li>num_attrs
-: <a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">stp_mxml_element_t</a>
+: <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s</a>
 <li>numsizes
-: <a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">stp_shade_t</a>
+: <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade</a>
 </ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u</a>
 </ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
@@ -275,27 +278,27 @@
 : <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t</a>
 , <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_t</a>
 <li>prescaled
-: <a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">stp_dither_matrix_normal_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">stp_dither_matrix_short_t</a>
+: <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short</a>
 <li>prev
 : <a class="el" href="structstp__mxml__node__s.html#2174125dc205e7c760e4e8c9c9048ddf">stp_mxml_node_s</a>
 <li>print
 : <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t</a>
 <li>printer_list
-: <a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">stp_family_t</a>
+: <a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">stp_family</a>
 <li>printfuncs
-: <a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">stp_family_t</a>
+: <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family</a>
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
 : <a class="el" href="structstp__parameter__t.html#4421135f9985be49d156cbc9aa74c710">stp_parameter_t</a>
 <li>real
-: <a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u</a>
 <li>rep
-: <a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">stp_image_t</a>
+: <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image</a>
 <li>reset
-: <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">stp_image_t</a>
+: <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image</a>
 <li>right
 : <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t</a>
 <li>row
@@ -305,7 +308,7 @@
 <li>s_cache
 : <a class="el" href="structstp__cached__curve__t.html#c55d549f6d2f567ba84ecb9e0417f074">stp_cached_curve_t</a>
 <li>short_name
-: <a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">stp_color_t</a>
+: <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color</a>
 <li>start_job
 : <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t</a>
 <li>start_pos
@@ -313,22 +316,22 @@
 <li>str
 : <a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">stp_parameter_t</a>
 <li>string
-: <a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">stp_mxml_text_t</a>
+: <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s</a>
 <li>subpass
 : <a class="el" href="structstp__pass__t.html#a4a3363d8de9121ba3d8bf28076b1c89">stp_pass_t</a>
 <li>syms
-: <a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">stp_module_t</a>
+: <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module</a>
 </ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <a class="el" href="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">stp_mxml_value_t</a>
+: <a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u</a>
 , <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t</a>
 , <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_t</a>
 , <a class="el" href="structstp__param__string__t.html#db032e80e118c233adb9f27544920bd1">stp_param_string_t</a>
 <li>top
 : <a class="el" href="structstp__papersize__t.html#7fc8acdb1d905d6ca4a0b9b247a6c48e">stp_papersize_t</a>
 <li>total_size
-: <a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl</a>
 <li>type
 : <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s</a>
 </ul>
@@ -345,47 +348,48 @@
 , <a class="el" href="structstp__linecount__t.html#2164f4045d892c45105f5780c80489a4">stp_linecount_t</a>
 <li>value
 : <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s</a>
-, <a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">stp_mxml_attr_t</a>
-, <a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">stp_dotsize_t</a>
-, <a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">stp_shade_t</a>
+, <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s</a>
+, <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize</a>
+, <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade</a>
 <li>verify
 : <a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">stp_printfuncs_t</a>
 <li>verify_this_parameter
 : <a class="el" href="structstp__parameter__t.html#56100203c262c60d4cb18c7a49cde27d">stp_parameter_t</a>
 <li>version
-: <a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">stp_module_t</a>
+: <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module</a>
 </ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">stp_mxml_text_t</a>
+: <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s</a>
 <li>width
 : <a class="el" href="structstp__papersize__t.html#edcca3776ddeb5ed815df3aa112147dd">stp_papersize_t</a>
-, <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">stp_image_t</a>
+, <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">stp_image</a>
 </ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
 : <a class="el" href="structstp__curve__point__t.html#92b13b94109b1270563a1116dc19b926">stp_curve_point_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">stp_dither_matrix_short_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal</a>
 <li>x_offset
-: <a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl</a>
 <li>x_size
-: <a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl</a>
 </ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
 : <a class="el" href="structstp__curve__point__t.html#132b1e8be20525667ece971d02f60b9d">stp_curve_point_t</a>
-, <a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">stp_dither_matrix_short_t</a>
-, <a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">stp_dither_matrix_generic_t</a>
-, <a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">stp_dither_matrix_normal_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal</a>
 <li>y_offset
-: <a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl</a>
 <li>y_size
-: <a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">stp_dither_matrix_impl_t</a>
+: <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 713285d..e56e628 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
@@ -55,8 +58,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>__attribute__
 : <a class="el" href="util_8h.html#9d373a9b65ff25b2db84c07394e1c212">util.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index 363ac70..9bc100b 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li class="current"><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li class="current"><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
@@ -53,8 +56,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__intl__internal.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl-internal.h</a>
 , <a class="el" href="group__intl.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index 9af9865..a0381cc 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li class="current"><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li class="current"><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
@@ -58,8 +61,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>CURVE_CACHE_FAST_USHORT
 : <a class="el" href="curve-cache_8h.html#4b278e86a2f914893307fb20cf218e7c">curve-cache.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index a88771e..ad23bbd 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li class="current"><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li class="current"><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
@@ -56,8 +59,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl-internal.h</a>
 , <a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index e6f8345..b9daaad 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li class="current"><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li class="current"><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
@@ -53,8 +56,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__intl__internal.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl-internal.h</a>
 , <a class="el" href="group__intl.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index 500e25e..05ebe2e 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li class="current"><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li class="current"><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
@@ -53,8 +56,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__intl__internal.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl-internal.h</a>
 , <a class="el" href="group__intl.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index 2fa4b54..5ae7275 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li class="current"><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li class="current"><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
@@ -68,8 +71,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>PARAMETER_OK
 : <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616">vars.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index 04da563..6ca2a7a 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li class="current"><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li class="current"><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
@@ -117,6 +120,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="channel_8h.html#35b64c052b8dcfd4f1576b10d999e022">channel.h</a>
 <li>STP_CHANNEL_LIMIT
 : <a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">image.h</a>
+<li>STP_CHANNEL_NONE
+: <a class="el" href="group__vars.html#g4f46af65b4df5881b980acba32a05b70">vars.h</a>
 <li>stp_channel_reset()
 : <a class="el" href="channel_8h.html#90026b1db4586b08df148db41a676b50">channel.h</a>
 <li>stp_channel_reset_channel()
@@ -151,6 +156,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389">vars.h</a>
 <li>stp_check_int_parameter()
 : <a class="el" href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c">vars.h</a>
+<li>stp_check_parameter()
+: <a class="el" href="group__vars.html#ga416ba26ede5046db94b54b9d846e329">vars.h</a>
 <li>stp_check_raw_parameter()
 : <a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">vars.h</a>
 <li>stp_check_string_parameter()
@@ -173,6 +180,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d">vars.h</a>
 <li>stp_clear_int_parameter()
 : <a class="el" href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46">vars.h</a>
+<li>stp_clear_parameter()
+: <a class="el" href="group__vars.html#g390f7c2fe642bea08507374a184de233">vars.h</a>
 <li>stp_clear_raw_parameter()
 : <a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">vars.h</a>
 <li>stp_clear_string_parameter()
@@ -193,6 +202,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__color.html#ga282220724877a57738b047140835141">color.h</a>
 <li>stp_color_register()
 : <a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">color.h</a>
+<li>stp_color_t
+: <a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">color.h</a>
 <li>stp_color_unregister()
 : <a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">color.h</a>
 <li>stp_compute_linewidth_func
@@ -383,6 +394,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__util.html#g01f4480bda8819f337b2be4c41e0ebe1">util.h</a>
 <li>STP_DBG_MODULE
 : <a class="el" href="group__util.html#g9ace1ab545abac936101248caf9a50c6">util.h</a>
+<li>STP_DBG_NO_COMPRESSION
+: <a class="el" href="group__util.html#ga447450ea502f96203aa2c47f6e49e92">util.h</a>
 <li>STP_DBG_PAPER
 : <a class="el" href="group__util.html#gd5eeaeabba7a0a861ae0dc936057aabd">util.h</a>
 <li>STP_DBG_PATH
@@ -441,6 +454,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="dither_8h.html#3ea3c72ff26afef246873edc0bc542d3">dither.h</a>
 <li>stp_dither_matrix_destroy()
 : <a class="el" href="dither_8h.html#49ff7bd6b10cd34f9164b4414adbb87c">dither.h</a>
+<li>stp_dither_matrix_generic_t
+: <a class="el" href="dither_8h.html#9f5f63d4f792df1d7becccf3fb5c8fdd">dither.h</a>
+<li>stp_dither_matrix_impl_t
+: <a class="el" href="dither_8h.html#f823fed10cb9591c0e659033ec49f55f">dither.h</a>
 <li>stp_dither_matrix_init()
 : <a class="el" href="dither_8h.html#2c42ec7156263c024ea6f51ab3b17530">dither.h</a>
 <li>stp_dither_matrix_init_from_dither_array()
@@ -449,12 +466,16 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="dither_8h.html#588103d2a828a6c5f51577a917b09cdf">dither.h</a>
 <li>stp_dither_matrix_iterated_init()
 : <a class="el" href="dither_8h.html#36691189c1f859d82675f32f5046e674">dither.h</a>
+<li>stp_dither_matrix_normal_t
+: <a class="el" href="dither_8h.html#febf0484e151cf3cce4ef0b9911d0022">dither.h</a>
 <li>stp_dither_matrix_scale_exponentially()
 : <a class="el" href="dither_8h.html#a62e8e672a125150074ea9bddb474423">dither.h</a>
 <li>stp_dither_matrix_set_row()
 : <a class="el" href="dither_8h.html#a6ca0a88b0bef517cc1909fb7074e8ac">dither.h</a>
 <li>stp_dither_matrix_shear()
 : <a class="el" href="dither_8h.html#df8bb5a54d552846dcf4d1534d612b65">dither.h</a>
+<li>stp_dither_matrix_short_t
+: <a class="el" href="dither_8h.html#9a2c54a4730e2c9bb25cf95f6cd3e597">dither.h</a>
 <li>stp_dither_matrix_validate_array()
 : <a class="el" href="dither_8h.html#ad322d923e2d9c3141cc50863d627b25">dither.h</a>
 <li>stp_dither_set_adaptive_limit()
@@ -477,6 +498,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="dither_8h.html#560bcf46dfa233a01bdf6042e4680f54">dither.h</a>
 <li>stp_dither_set_transition()
 : <a class="el" href="dither_8h.html#6f4efd170562a43139f7d6a4b41ecaf3">dither.h</a>
+<li>stp_dotsize_t
+: <a class="el" href="dither_8h.html#7a74b9371fd47b48d961d2316e2126e4">dither.h</a>
 <li>stp_dprintf()
 : <a class="el" href="group__util.html#g511e0c4cac91c674797da98ab96b83e6">util.h</a>
 <li>STP_ECOLOR_C
@@ -497,6 +520,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__util.html#g15987fbd850e04f2520cb151e08908e1">util.h</a>
 <li>stp_family_register()
 : <a class="el" href="group__printer.html#g1c6d389f49a185ca24546107bd6f4993">printers.h</a>
+<li>stp_family_t
+: <a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">printers.h</a>
 <li>stp_family_unregister()
 : <a class="el" href="group__printer.html#g67e5c18254f7ad0b0fd77b4cc2265405">printers.h</a>
 <li>stp_fill_parameter_settings()
@@ -609,6 +634,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630">paper.h</a>
 <li>stp_get_papersize_by_size()
 : <a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">paper.h</a>
+<li>stp_get_papersize_by_size_exact()
+: <a class="el" href="group__papersize.html#g879cd515ca2eb5fd8cd76ae62f4bfa4e">paper.h</a>
+<li>stp_get_parameter_active()
+: <a class="el" href="group__vars.html#g31b32d5481a838276f23cfa4bc010c03">vars.h</a>
 <li>stp_get_parameter_list()
 : <a class="el" href="group__vars.html#g12e8bb617e5c90da99d6d74519664634">vars.h</a>
 <li>stp_get_pass_by_pass()
@@ -661,6 +690,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">image.h</a>
 <li>stp_image_status_t
 : <a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">image.h</a>
+<li>stp_image_t
+: <a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">image.h</a>
 <li>stp_image_width()
 : <a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">image.h</a>
 <li>stp_init()
@@ -677,12 +708,24 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c">gutenprint-version.h</a>
 <li>stp_known_papersizes()
 : <a class="el" href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99">paper.h</a>
+<li>stp_list_array_parameters()
+: <a class="el" href="group__vars.html#g16d23d59368e907a29719f0902ea75fe">vars.h</a>
+<li>stp_list_boolean_parameters()
+: <a class="el" href="group__vars.html#g60f98e23144fd1bf5aa53def670b2c91">vars.h</a>
 <li>stp_list_copy()
 : <a class="el" href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8">list.h</a>
 <li>stp_list_create()
 : <a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca">list.h</a>
+<li>stp_list_curve_parameters()
+: <a class="el" href="group__vars.html#g1329d614d6cd18fc6c244b020e26b081">vars.h</a>
 <li>stp_list_destroy()
 : <a class="el" href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1">list.h</a>
+<li>stp_list_dimension_parameters()
+: <a class="el" href="group__vars.html#g5cae4a118badc7c52e5f7b7543c83d8e">vars.h</a>
+<li>stp_list_file_parameters()
+: <a class="el" href="group__vars.html#g76c7e033078e6c2fa276ee72ca97c63c">vars.h</a>
+<li>stp_list_float_parameters()
+: <a class="el" href="group__vars.html#gdec4183ce240188ed18fdc21d9b518f7">vars.h</a>
 <li>stp_list_get_copyfunc()
 : <a class="el" href="group__list.html#g686e92ee802147171e5fc723d0079b8d">list.h</a>
 <li>stp_list_get_end()
@@ -705,6 +748,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454">list.h</a>
 <li>stp_list_get_start()
 : <a class="el" href="group__list.html#gd185100e8d7969a473e9d42bc8084572">list.h</a>
+<li>stp_list_int_parameters()
+: <a class="el" href="group__vars.html#ge08d29a439b77219f32d037ab5b191f5">vars.h</a>
 <li>stp_list_item_create()
 : <a class="el" href="group__list.html#ge726297a82e140672a018e135ffc6a0e">list.h</a>
 <li>stp_list_item_destroy()
@@ -721,6 +766,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">list.h</a>
 <li>stp_list_node_free_data()
 : <a class="el" href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624">list.h</a>
+<li>stp_list_parameters()
+: <a class="el" href="group__vars.html#g27864133bc2159d1472cbdfb3b781c27">vars.h</a>
+<li>stp_list_raw_parameters()
+: <a class="el" href="group__vars.html#g4d06ccaf72d08800f7eb78b3293f4a00">vars.h</a>
 <li>stp_list_set_copyfunc()
 : <a class="el" href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6">list.h</a>
 <li>stp_list_set_freefunc()
@@ -731,6 +780,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__list.html#g889af512d87a00d696acc0b6b3fafe78">list.h</a>
 <li>stp_list_set_sortfunc()
 : <a class="el" href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784">list.h</a>
+<li>stp_list_string_parameters()
+: <a class="el" href="group__vars.html#g110e543418842a6dd79149409620bf13">vars.h</a>
 <li>stp_list_t
 : <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">list.h</a>
 <li>STP_MAJOR_VERSION
@@ -777,18 +828,26 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="module_8h.html#00007a419775e60142cefd98b1dd3f2c">module.h</a>
 <li>stp_module_open()
 : <a class="el" href="module_8h.html#38df0c9e639b108f785be84d087923e9">module.h</a>
+<li>stp_module_t
+: <a class="el" href="module_8h.html#e1e92953e8ffaa00cfbf7fc01e51f36d">module.h</a>
+<li>stp_module_version_t
+: <a class="el" href="module_8h.html#753a8450e5ac6b73134c12b89533f16e">module.h</a>
 <li>STP_MXML_ADD_AFTER
 : <a class="el" href="mxml_8h.html#a046bb0b67f278cb7ffdd0be5336b4f3">mxml.h</a>
 <li>STP_MXML_ADD_BEFORE
 : <a class="el" href="mxml_8h.html#1920c86773f4394ebd778b6e6b8f1aba">mxml.h</a>
 <li>STP_MXML_ADD_TO_PARENT
 : <a class="el" href="mxml_8h.html#5c364d2523fb6f7a133df3fdfd7f44d5">mxml.h</a>
+<li>stp_mxml_attr_t
+: <a class="el" href="mxml_8h.html#b271ad8c2bb8d7e6b4b453ffe5589564">mxml.h</a>
 <li>STP_MXML_DESCEND
 : <a class="el" href="mxml_8h.html#7c552ec507bb896f89f002de30a21378">mxml.h</a>
 <li>STP_MXML_DESCEND_FIRST
 : <a class="el" href="mxml_8h.html#bff818057f8c875f4152aa49ed5c046b">mxml.h</a>
 <li>STP_MXML_ELEMENT
 : <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e">mxml.h</a>
+<li>stp_mxml_element_t
+: <a class="el" href="mxml_8h.html#70e20b752807f49a56b56d80ee470b47">mxml.h</a>
 <li>STP_MXML_INTEGER
 : <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79">mxml.h</a>
 <li>STP_MXML_NO_CALLBACK
@@ -807,10 +866,14 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="mxml_8h.html#f14eeab60ef7298e7fbb04f9f80ec81f">mxml.h</a>
 <li>STP_MXML_TEXT
 : <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9">mxml.h</a>
+<li>stp_mxml_text_t
+: <a class="el" href="mxml_8h.html#b9c0236a2d70c3bcb210a9f6fadf00a3">mxml.h</a>
 <li>stp_mxml_type_e
 : <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">mxml.h</a>
 <li>stp_mxml_type_t
 : <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">mxml.h</a>
+<li>stp_mxml_value_t
+: <a class="el" href="mxml_8h.html#9a2e2ffccac3c73524e76f3e816d35bf">mxml.h</a>
 <li>STP_MXML_WRAP
 : <a class="el" href="mxml_8h.html#0958b60267481400b1037902e060027f">mxml.h</a>
 <li>STP_MXML_WS_AFTER_CLOSE
@@ -833,6 +896,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="mxml_8h.html#65c27e9c331c88b3f010f040591cc401">mxml.h</a>
 <li>stp_mxmlLoadFile()
 : <a class="el" href="mxml_8h.html#88f8bf556fb254728ab23ce931ee9224">mxml.h</a>
+<li>stp_mxmlLoadFromFile()
+: <a class="el" href="mxml_8h.html#7fbf0906a36fe755779077efd7126704">mxml.h</a>
 <li>stp_mxmlLoadString()
 : <a class="el" href="mxml_8h.html#4a2465973559fe7815386d0d59d9a8ee">mxml.h</a>
 <li>stp_mxmlNewElement()
@@ -853,6 +918,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="mxml_8h.html#1038b1003e9a3fbd8396cdbe989a64c8">mxml.h</a>
 <li>stp_mxmlSaveString()
 : <a class="el" href="mxml_8h.html#054f6b6df45f2e0072a61c1a438d3ebe">mxml.h</a>
+<li>stp_mxmlSaveToFile()
+: <a class="el" href="mxml_8h.html#ee3de9dc6a961f11238960d1dd1ea5c3">mxml.h</a>
 <li>stp_mxmlWalkNext()
 : <a class="el" href="mxml_8h.html#f478d00f31cfae58314bd6f40531923b">mxml.h</a>
 <li>stp_mxmlWalkPrev()
@@ -989,6 +1056,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">printers.h</a>
 <li>stp_printer_t
 : <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">printers.h</a>
+<li>stp_prtraw()
+: <a class="el" href="xml_8h.html#13a01102edf22955690bf21a44049369">xml.h</a>
 <li>stp_prune_inactive_options()
 : <a class="el" href="group__util.html#g13aa8afef5b0872704390adc6a01924e">util.h</a>
 <li>stp_put16_be()
@@ -1009,6 +1078,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#g9fc3819cba14f7f4c5654508a08a1adf">vars.h</a>
 <li>STP_RAW_STRING
 : <a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">vars.h</a>
+<li>stp_rawtoxmlstr()
+: <a class="el" href="xml_8h.html#3e003171cb008a542fffbeff3f2e2299">xml.h</a>
 <li>stp_read_and_compose_curves()
 : <a class="el" href="group__util.html#gdbe8c167230b49bc10391d2c246e6dc0">util.h</a>
 <li>stp_realloc()
@@ -1090,11 +1161,11 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>stp_set_array_parameter()
 : <a class="el" href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b">vars.h</a>
 <li>stp_set_array_parameter_active()
-: <a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">vars.h</a>
+: <a class="el" href="group__vars.html#g4d13479ad3669ec9b8d7dcc109bc8e7d">vars.h</a>
 <li>stp_set_boolean_parameter()
 : <a class="el" href="group__vars.html#g2167971895eea887eaaa656ed075beff">vars.h</a>
 <li>stp_set_boolean_parameter_active()
-: <a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">vars.h</a>
+: <a class="el" href="group__vars.html#g3b74af22c776ddebd6b70455e196fe1c">vars.h</a>
 <li>stp_set_color_conversion()
 : <a class="el" href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea">vars.h</a>
 <li>stp_set_color_conversion_n()
@@ -1102,7 +1173,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>stp_set_curve_parameter()
 : <a class="el" href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025">vars.h</a>
 <li>stp_set_curve_parameter_active()
-: <a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">vars.h</a>
+: <a class="el" href="group__vars.html#g0486744f97114ba03d4f8f7562d6c739">vars.h</a>
 <li>stp_set_default_array_parameter()
 : <a class="el" href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f">vars.h</a>
 <li>stp_set_default_boolean_parameter()
@@ -1128,7 +1199,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>stp_set_dimension_parameter()
 : <a class="el" href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417">vars.h</a>
 <li>stp_set_dimension_parameter_active()
-: <a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">vars.h</a>
+: <a class="el" href="group__vars.html#g28feceb75f731d6de08d1fdad1fc269e">vars.h</a>
 <li>stp_set_driver()
 : <a class="el" href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf">vars.h</a>
 <li>stp_set_driver_n()
@@ -1140,19 +1211,19 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>stp_set_file_parameter()
 : <a class="el" href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f">vars.h</a>
 <li>stp_set_file_parameter_active()
-: <a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">vars.h</a>
+: <a class="el" href="group__vars.html#g0628a3f1feb7db7b5b10249a2b4f2412">vars.h</a>
 <li>stp_set_file_parameter_n()
 : <a class="el" href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a">vars.h</a>
 <li>stp_set_float_parameter()
 : <a class="el" href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796">vars.h</a>
 <li>stp_set_float_parameter_active()
-: <a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">vars.h</a>
+: <a class="el" href="group__vars.html#g49e5b05ba7bf8ccf6e95cb744f4f0f93">vars.h</a>
 <li>stp_set_height()
 : <a class="el" href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667">vars.h</a>
 <li>stp_set_int_parameter()
 : <a class="el" href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a">vars.h</a>
 <li>stp_set_int_parameter_active()
-: <a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">vars.h</a>
+: <a class="el" href="group__vars.html#g0cc1a26e8c3d502024c55a065fd5629a">vars.h</a>
 <li>stp_set_left()
 : <a class="el" href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb">vars.h</a>
 <li>stp_set_outdata()
@@ -1165,16 +1236,20 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f">vars.h</a>
 <li>stp_set_page_width()
 : <a class="el" href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9">vars.h</a>
+<li>stp_set_parameter_active()
+: <a class="el" href="group__vars.html#g5ececd1972a375e1e569ed4a242ed1ed">vars.h</a>
 <li>stp_set_printer_defaults()
 : <a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">printers.h</a>
+<li>stp_set_printer_defaults_soft()
+: <a class="el" href="group__printer.html#gc2ed6f27e4db29ceaa74a1b9bd6a78cf">printers.h</a>
 <li>stp_set_raw_parameter()
 : <a class="el" href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56">vars.h</a>
 <li>stp_set_raw_parameter_active()
-: <a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">vars.h</a>
+: <a class="el" href="group__vars.html#g47b8c3b31693ecdef420160b40b23a0d">vars.h</a>
 <li>stp_set_string_parameter()
 : <a class="el" href="group__vars.html#ga147483996fa118516ddb36fe3366aa9">vars.h</a>
 <li>stp_set_string_parameter_active()
-: <a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">vars.h</a>
+: <a class="el" href="group__vars.html#gc9f06e27ce5b6808d30c6fc01558db3b">vars.h</a>
 <li>stp_set_string_parameter_n()
 : <a class="el" href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48">vars.h</a>
 <li>stp_set_top()
@@ -1183,6 +1258,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#g1023ad18d2c97763137909b6191b0940">vars.h</a>
 <li>stp_set_width()
 : <a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">vars.h</a>
+<li>stp_shade_t
+: <a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">dither.h</a>
 <li>stp_split_2()
 : <a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">bit-ops.h</a>
 <li>stp_split_4()
@@ -1217,6 +1294,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__util.html#g56b08d3e12750bdfae8b53263f97aba9">util.h</a>
 <li>stp_strndup()
 : <a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">util.h</a>
+<li>stp_strtoxmlstr()
+: <a class="el" href="xml_8h.html#6bdda178f51ef17e02b0c662e0b06a8b">xml.h</a>
 <li>stp_unpack_16()
 : <a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">bit-ops.h</a>
 <li>stp_unpack_2()
@@ -1235,8 +1314,16 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc">vars.h</a>
 <li>stp_vars_create_copy()
 : <a class="el" href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48">vars.h</a>
+<li>stp_vars_create_from_xmltree()
+: <a class="el" href="xml_8h.html#2ec4cf1f87b354d564429f3d34afd029">xml.h</a>
+<li>stp_vars_create_from_xmltree_ref()
+: <a class="el" href="xml_8h.html#cecaf19b0eb498487f14bf462c181c16">xml.h</a>
 <li>stp_vars_destroy()
 : <a class="el" href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437">vars.h</a>
+<li>stp_vars_fill_from_xmltree()
+: <a class="el" href="xml_8h.html#c0c8478cc24d2aee3eaaf7eafa4586b9">xml.h</a>
+<li>stp_vars_fill_from_xmltree_ref()
+: <a class="el" href="xml_8h.html#152b1cd11fb8bc6b7ecc95c65ee74ec6">xml.h</a>
 <li>stp_vars_t
 : <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">vars.h</a>
 <li>stp_verify()
@@ -1285,6 +1372,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="xml_8h.html#955626cb67a5067d67a116f8ab67007d">xml.h</a>
 <li>stp_xmlstrtol()
 : <a class="el" href="xml_8h.html#28f6df53b5a7623b654dff6ec26db8c7">xml.h</a>
+<li>stp_xmlstrtoraw()
+: <a class="el" href="xml_8h.html#4a44cfc8ec6e821c4f8564397b3bd66f">xml.h</a>
 <li>stp_xmlstrtoul()
 : <a class="el" href="xml_8h.html#1c1ba2f2312544bda8b3ce2e919e4687">xml.h</a>
 <li>stp_xmltree_create_from_array()
@@ -1293,15 +1382,24 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="xml_8h.html#e8c5f8944f4921f772eb12e52c7fb95d">xml.h</a>
 <li>stp_xmltree_create_from_sequence()
 : <a class="el" href="xml_8h.html#d03ea12e2b0089daf469c6af120ef180">xml.h</a>
+<li>stp_xmltree_create_from_vars()
+: <a class="el" href="xml_8h.html#139bc6e17f2ccabf7e149241f923d9c4">xml.h</a>
 <li>stp_zalloc()
 : <a class="el" href="group__util.html#gc8fd1a439fa2d8e1ff1a2b104cd0137b">util.h</a>
 <li>stp_zfwrite()
 : <a class="el" href="group__util.html#g183d8f36f187530f9d7acdb176be3409">util.h</a>
 <li>stp_zprintf()
 : <a class="el" href="group__util.html#gd7ffe058decb939af6a5c1ec1d0d77fa">util.h</a>
+<li>stpi_data_path()
+: <a class="el" href="path_8h.html#26017fec6cd9c9e44bc58b4cac9b9c35">path.h</a>
+<li>stpi_list_files_on_data_path()
+: <a class="el" href="path_8h.html#037cae76d9cb1916ec7fa711a127fe54">path.h</a>
+<li>stpi_path_merge()
+: <a class="el" href="path_8h.html#17eca69c41eb6cca959ab47e3c1a3aa2">path.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index e1de8fc..d6f03a3 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -4,48 +4,51 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html#index__"><span>_</span></a></li>
-    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
-    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
-    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
-    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
-    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
-    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
-    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
-    <li class="current"><a href="globals_0x74.html#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html#index__"><span>_</span></a></li>
+      <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+      <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+      <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+      <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+      <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+      <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+      <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+      <li class="current"><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
@@ -53,8 +56,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__intl__internal.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl-internal.h</a>
 , <a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index e1657c0..f749cc7 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -4,47 +4,50 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index__"><span>_</span></a></li>
-    <li><a href="#index_b"><span>b</span></a></li>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_d"><span>d</span></a></li>
-    <li><a href="#index_g"><span>g</span></a></li>
-    <li><a href="#index_n"><span>n</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-    <li><a href="#index_t"><span>t</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index__"><span>_</span></a></li>
+      <li><a href="#index_b"><span>b</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_d"><span>d</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
@@ -90,6 +93,8 @@
 : <a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">gutenprint-version.h</a>
 <li>STP_CHANNEL_LIMIT
 : <a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">image.h</a>
+<li>STP_CHANNEL_NONE
+: <a class="el" href="group__vars.html#g4f46af65b4df5881b980acba32a05b70">vars.h</a>
 <li>STP_CHECK_VERSION
 : <a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">gutenprint-version.h</a>
 <li>STP_CURRENT_INTERFACE
@@ -118,6 +123,8 @@
 : <a class="el" href="group__util.html#g01f4480bda8819f337b2be4c41e0ebe1">util.h</a>
 <li>STP_DBG_MODULE
 : <a class="el" href="group__util.html#g9ace1ab545abac936101248caf9a50c6">util.h</a>
+<li>STP_DBG_NO_COMPRESSION
+: <a class="el" href="group__util.html#ga447450ea502f96203aa2c47f6e49e92">util.h</a>
 <li>STP_DBG_PAPER
 : <a class="el" href="group__util.html#gd5eeaeabba7a0a861ae0dc936057aabd">util.h</a>
 <li>STP_DBG_PATH
@@ -200,8 +207,9 @@
 : <a class="el" href="group__intl__internal.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl-internal.h</a>
 , <a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index ae8b506..ccf660c 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -4,33 +4,36 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 &nbsp;
 <p>
 <ul>
@@ -65,8 +68,9 @@
 <li>stp_weave_strategy_t
 : <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">weave.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index b54fead..81a7f9d 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -4,41 +4,44 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index_p"><span>p</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
@@ -171,8 +174,9 @@
 <li>STP_WEAVE_ZIGZAG
 : <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3">weave.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index 42178e1..04ca867 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -4,40 +4,43 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals_func.html#index_s"><span>s</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals_func.html#index_s"><span>s</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
@@ -135,6 +138,8 @@
 : <a class="el" href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389">vars.h</a>
 <li>stp_check_int_parameter()
 : <a class="el" href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c">vars.h</a>
+<li>stp_check_parameter()
+: <a class="el" href="group__vars.html#ga416ba26ede5046db94b54b9d846e329">vars.h</a>
 <li>stp_check_raw_parameter()
 : <a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">vars.h</a>
 <li>stp_check_string_parameter()
@@ -155,6 +160,8 @@
 : <a class="el" href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d">vars.h</a>
 <li>stp_clear_int_parameter()
 : <a class="el" href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46">vars.h</a>
+<li>stp_clear_parameter()
+: <a class="el" href="group__vars.html#g390f7c2fe642bea08507374a184de233">vars.h</a>
 <li>stp_clear_raw_parameter()
 : <a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">vars.h</a>
 <li>stp_clear_string_parameter()
@@ -485,6 +492,10 @@
 : <a class="el" href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630">paper.h</a>
 <li>stp_get_papersize_by_size()
 : <a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">paper.h</a>
+<li>stp_get_papersize_by_size_exact()
+: <a class="el" href="group__papersize.html#g879cd515ca2eb5fd8cd76ae62f4bfa4e">paper.h</a>
+<li>stp_get_parameter_active()
+: <a class="el" href="group__vars.html#g31b32d5481a838276f23cfa4bc010c03">vars.h</a>
 <li>stp_get_parameter_list()
 : <a class="el" href="group__vars.html#g12e8bb617e5c90da99d6d74519664634">vars.h</a>
 <li>stp_get_pass_by_pass()
@@ -543,12 +554,24 @@
 : <a class="el" href="weave_8h.html#5b4fc76c83f5408182f90fb139c06b50">weave.h</a>
 <li>stp_known_papersizes()
 : <a class="el" href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99">paper.h</a>
+<li>stp_list_array_parameters()
+: <a class="el" href="group__vars.html#g16d23d59368e907a29719f0902ea75fe">vars.h</a>
+<li>stp_list_boolean_parameters()
+: <a class="el" href="group__vars.html#g60f98e23144fd1bf5aa53def670b2c91">vars.h</a>
 <li>stp_list_copy()
 : <a class="el" href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8">list.h</a>
 <li>stp_list_create()
 : <a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca">list.h</a>
+<li>stp_list_curve_parameters()
+: <a class="el" href="group__vars.html#g1329d614d6cd18fc6c244b020e26b081">vars.h</a>
 <li>stp_list_destroy()
 : <a class="el" href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1">list.h</a>
+<li>stp_list_dimension_parameters()
+: <a class="el" href="group__vars.html#g5cae4a118badc7c52e5f7b7543c83d8e">vars.h</a>
+<li>stp_list_file_parameters()
+: <a class="el" href="group__vars.html#g76c7e033078e6c2fa276ee72ca97c63c">vars.h</a>
+<li>stp_list_float_parameters()
+: <a class="el" href="group__vars.html#gdec4183ce240188ed18fdc21d9b518f7">vars.h</a>
 <li>stp_list_get_copyfunc()
 : <a class="el" href="group__list.html#g686e92ee802147171e5fc723d0079b8d">list.h</a>
 <li>stp_list_get_end()
@@ -571,6 +594,8 @@
 : <a class="el" href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454">list.h</a>
 <li>stp_list_get_start()
 : <a class="el" href="group__list.html#gd185100e8d7969a473e9d42bc8084572">list.h</a>
+<li>stp_list_int_parameters()
+: <a class="el" href="group__vars.html#ge08d29a439b77219f32d037ab5b191f5">vars.h</a>
 <li>stp_list_item_create()
 : <a class="el" href="group__list.html#ge726297a82e140672a018e135ffc6a0e">list.h</a>
 <li>stp_list_item_destroy()
@@ -585,6 +610,10 @@
 : <a class="el" href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4">list.h</a>
 <li>stp_list_node_free_data()
 : <a class="el" href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624">list.h</a>
+<li>stp_list_parameters()
+: <a class="el" href="group__vars.html#g27864133bc2159d1472cbdfb3b781c27">vars.h</a>
+<li>stp_list_raw_parameters()
+: <a class="el" href="group__vars.html#g4d06ccaf72d08800f7eb78b3293f4a00">vars.h</a>
 <li>stp_list_set_copyfunc()
 : <a class="el" href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6">list.h</a>
 <li>stp_list_set_freefunc()
@@ -595,6 +624,8 @@
 : <a class="el" href="group__list.html#g889af512d87a00d696acc0b6b3fafe78">list.h</a>
 <li>stp_list_set_sortfunc()
 : <a class="el" href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784">list.h</a>
+<li>stp_list_string_parameters()
+: <a class="el" href="group__vars.html#g110e543418842a6dd79149409620bf13">vars.h</a>
 <li>stp_malloc()
 : <a class="el" href="group__util.html#g86a2976738a237df953655e733c75b3a">util.h</a>
 <li>stp_merge_printvars()
@@ -623,6 +654,8 @@
 : <a class="el" href="mxml_8h.html#65c27e9c331c88b3f010f040591cc401">mxml.h</a>
 <li>stp_mxmlLoadFile()
 : <a class="el" href="mxml_8h.html#88f8bf556fb254728ab23ce931ee9224">mxml.h</a>
+<li>stp_mxmlLoadFromFile()
+: <a class="el" href="mxml_8h.html#7fbf0906a36fe755779077efd7126704">mxml.h</a>
 <li>stp_mxmlLoadString()
 : <a class="el" href="mxml_8h.html#4a2465973559fe7815386d0d59d9a8ee">mxml.h</a>
 <li>stp_mxmlNewElement()
@@ -643,6 +676,8 @@
 : <a class="el" href="mxml_8h.html#1038b1003e9a3fbd8396cdbe989a64c8">mxml.h</a>
 <li>stp_mxmlSaveString()
 : <a class="el" href="mxml_8h.html#054f6b6df45f2e0072a61c1a438d3ebe">mxml.h</a>
+<li>stp_mxmlSaveToFile()
+: <a class="el" href="mxml_8h.html#ee3de9dc6a961f11238960d1dd1ea5c3">mxml.h</a>
 <li>stp_mxmlWalkNext()
 : <a class="el" href="mxml_8h.html#f478d00f31cfae58314bd6f40531923b">mxml.h</a>
 <li>stp_mxmlWalkPrev()
@@ -691,6 +726,8 @@
 : <a class="el" href="group__printer.html#g09bf7aebf0385f7b5aac537a13b6e3ed">printers.h</a>
 <li>stp_printer_model_count()
 : <a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">printers.h</a>
+<li>stp_prtraw()
+: <a class="el" href="xml_8h.html#13a01102edf22955690bf21a44049369">xml.h</a>
 <li>stp_prune_inactive_options()
 : <a class="el" href="group__util.html#g13aa8afef5b0872704390adc6a01924e">util.h</a>
 <li>stp_put16_be()
@@ -707,6 +744,8 @@
 : <a class="el" href="group__util.html#g79dd0a6f5c63f4fbf8591d3c041a7720">util.h</a>
 <li>stp_puts()
 : <a class="el" href="group__util.html#gf6cf72e5e45f175ae8c332c0588832b9">util.h</a>
+<li>stp_rawtoxmlstr()
+: <a class="el" href="xml_8h.html#3e003171cb008a542fffbeff3f2e2299">xml.h</a>
 <li>stp_read_and_compose_curves()
 : <a class="el" href="group__util.html#gdbe8c167230b49bc10391d2c246e6dc0">util.h</a>
 <li>stp_realloc()
@@ -784,11 +823,11 @@
 <li>stp_set_array_parameter()
 : <a class="el" href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b">vars.h</a>
 <li>stp_set_array_parameter_active()
-: <a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">vars.h</a>
+: <a class="el" href="group__vars.html#g4d13479ad3669ec9b8d7dcc109bc8e7d">vars.h</a>
 <li>stp_set_boolean_parameter()
 : <a class="el" href="group__vars.html#g2167971895eea887eaaa656ed075beff">vars.h</a>
 <li>stp_set_boolean_parameter_active()
-: <a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">vars.h</a>
+: <a class="el" href="group__vars.html#g3b74af22c776ddebd6b70455e196fe1c">vars.h</a>
 <li>stp_set_color_conversion()
 : <a class="el" href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea">vars.h</a>
 <li>stp_set_color_conversion_n()
@@ -796,7 +835,7 @@
 <li>stp_set_curve_parameter()
 : <a class="el" href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025">vars.h</a>
 <li>stp_set_curve_parameter_active()
-: <a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">vars.h</a>
+: <a class="el" href="group__vars.html#g0486744f97114ba03d4f8f7562d6c739">vars.h</a>
 <li>stp_set_default_array_parameter()
 : <a class="el" href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f">vars.h</a>
 <li>stp_set_default_boolean_parameter()
@@ -822,7 +861,7 @@
 <li>stp_set_dimension_parameter()
 : <a class="el" href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417">vars.h</a>
 <li>stp_set_dimension_parameter_active()
-: <a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">vars.h</a>
+: <a class="el" href="group__vars.html#g28feceb75f731d6de08d1fdad1fc269e">vars.h</a>
 <li>stp_set_driver()
 : <a class="el" href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf">vars.h</a>
 <li>stp_set_driver_n()
@@ -834,19 +873,19 @@
 <li>stp_set_file_parameter()
 : <a class="el" href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f">vars.h</a>
 <li>stp_set_file_parameter_active()
-: <a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">vars.h</a>
+: <a class="el" href="group__vars.html#g0628a3f1feb7db7b5b10249a2b4f2412">vars.h</a>
 <li>stp_set_file_parameter_n()
 : <a class="el" href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a">vars.h</a>
 <li>stp_set_float_parameter()
 : <a class="el" href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796">vars.h</a>
 <li>stp_set_float_parameter_active()
-: <a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">vars.h</a>
+: <a class="el" href="group__vars.html#g49e5b05ba7bf8ccf6e95cb744f4f0f93">vars.h</a>
 <li>stp_set_height()
 : <a class="el" href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667">vars.h</a>
 <li>stp_set_int_parameter()
 : <a class="el" href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a">vars.h</a>
 <li>stp_set_int_parameter_active()
-: <a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">vars.h</a>
+: <a class="el" href="group__vars.html#g0cc1a26e8c3d502024c55a065fd5629a">vars.h</a>
 <li>stp_set_left()
 : <a class="el" href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb">vars.h</a>
 <li>stp_set_outdata()
@@ -859,16 +898,20 @@
 : <a class="el" href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f">vars.h</a>
 <li>stp_set_page_width()
 : <a class="el" href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9">vars.h</a>
+<li>stp_set_parameter_active()
+: <a class="el" href="group__vars.html#g5ececd1972a375e1e569ed4a242ed1ed">vars.h</a>
 <li>stp_set_printer_defaults()
 : <a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">printers.h</a>
+<li>stp_set_printer_defaults_soft()
+: <a class="el" href="group__printer.html#gc2ed6f27e4db29ceaa74a1b9bd6a78cf">printers.h</a>
 <li>stp_set_raw_parameter()
 : <a class="el" href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56">vars.h</a>
 <li>stp_set_raw_parameter_active()
-: <a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">vars.h</a>
+: <a class="el" href="group__vars.html#g47b8c3b31693ecdef420160b40b23a0d">vars.h</a>
 <li>stp_set_string_parameter()
 : <a class="el" href="group__vars.html#ga147483996fa118516ddb36fe3366aa9">vars.h</a>
 <li>stp_set_string_parameter_active()
-: <a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">vars.h</a>
+: <a class="el" href="group__vars.html#gc9f06e27ce5b6808d30c6fc01558db3b">vars.h</a>
 <li>stp_set_string_parameter_n()
 : <a class="el" href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48">vars.h</a>
 <li>stp_set_top()
@@ -909,6 +952,8 @@
 : <a class="el" href="group__util.html#g56b08d3e12750bdfae8b53263f97aba9">util.h</a>
 <li>stp_strndup()
 : <a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">util.h</a>
+<li>stp_strtoxmlstr()
+: <a class="el" href="xml_8h.html#6bdda178f51ef17e02b0c662e0b06a8b">xml.h</a>
 <li>stp_unpack_16()
 : <a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">bit-ops.h</a>
 <li>stp_unpack_2()
@@ -927,8 +972,16 @@
 : <a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc">vars.h</a>
 <li>stp_vars_create_copy()
 : <a class="el" href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48">vars.h</a>
+<li>stp_vars_create_from_xmltree()
+: <a class="el" href="xml_8h.html#2ec4cf1f87b354d564429f3d34afd029">xml.h</a>
+<li>stp_vars_create_from_xmltree_ref()
+: <a class="el" href="xml_8h.html#cecaf19b0eb498487f14bf462c181c16">xml.h</a>
 <li>stp_vars_destroy()
 : <a class="el" href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437">vars.h</a>
+<li>stp_vars_fill_from_xmltree()
+: <a class="el" href="xml_8h.html#c0c8478cc24d2aee3eaaf7eafa4586b9">xml.h</a>
+<li>stp_vars_fill_from_xmltree_ref()
+: <a class="el" href="xml_8h.html#152b1cd11fb8bc6b7ecc95c65ee74ec6">xml.h</a>
 <li>stp_verify()
 : <a class="el" href="group__vars.html#gb926417b2f601c78d85df44694cc6d38">vars.h</a>
 <li>stp_verify_parameter()
@@ -959,6 +1012,8 @@
 : <a class="el" href="xml_8h.html#955626cb67a5067d67a116f8ab67007d">xml.h</a>
 <li>stp_xmlstrtol()
 : <a class="el" href="xml_8h.html#28f6df53b5a7623b654dff6ec26db8c7">xml.h</a>
+<li>stp_xmlstrtoraw()
+: <a class="el" href="xml_8h.html#4a44cfc8ec6e821c4f8564397b3bd66f">xml.h</a>
 <li>stp_xmlstrtoul()
 : <a class="el" href="xml_8h.html#1c1ba2f2312544bda8b3ce2e919e4687">xml.h</a>
 <li>stp_xmltree_create_from_array()
@@ -967,15 +1022,24 @@
 : <a class="el" href="xml_8h.html#e8c5f8944f4921f772eb12e52c7fb95d">xml.h</a>
 <li>stp_xmltree_create_from_sequence()
 : <a class="el" href="xml_8h.html#d03ea12e2b0089daf469c6af120ef180">xml.h</a>
+<li>stp_xmltree_create_from_vars()
+: <a class="el" href="xml_8h.html#139bc6e17f2ccabf7e149241f923d9c4">xml.h</a>
 <li>stp_zalloc()
 : <a class="el" href="group__util.html#gc8fd1a439fa2d8e1ff1a2b104cd0137b">util.h</a>
 <li>stp_zfwrite()
 : <a class="el" href="group__util.html#g183d8f36f187530f9d7acdb176be3409">util.h</a>
 <li>stp_zprintf()
 : <a class="el" href="group__util.html#gd7ffe058decb939af6a5c1ec1d0d77fa">util.h</a>
+<li>stpi_data_path()
+: <a class="el" href="path_8h.html#26017fec6cd9c9e44bc58b4cac9b9c35">path.h</a>
+<li>stpi_list_files_on_data_path()
+: <a class="el" href="path_8h.html#037cae76d9cb1916ec7fa711a127fe54">path.h</a>
+<li>stpi_path_merge()
+: <a class="el" href="path_8h.html#17eca69c41eb6cca959ab47e3c1a3aa2">path.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index ad226bf..38a19ef 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -4,40 +4,55 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+    </ul>
+  </div>
+
+<p>
 </div>
+<div class="contents">
 &nbsp;
 <p>
-<ul>
+<h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>compdata_t
 : <a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">vars.h</a>
+</ul>
+<h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_array_t
 : <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">array.h</a>
+<li>stp_color_t
+: <a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">color.h</a>
 <li>stp_compute_linewidth_func
 : <a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">weave.h</a>
 <li>stp_const_parameter_list_t
@@ -46,20 +61,46 @@
 : <a class="el" href="group__vars.html#g25e6aec21fd8f8a65c4c4086d0f3dec0">vars.h</a>
 <li>stp_curve_t
 : <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">curve.h</a>
+<li>stp_dither_matrix_generic_t
+: <a class="el" href="dither_8h.html#9f5f63d4f792df1d7becccf3fb5c8fdd">dither.h</a>
+<li>stp_dither_matrix_impl_t
+: <a class="el" href="dither_8h.html#f823fed10cb9591c0e659033ec49f55f">dither.h</a>
+<li>stp_dither_matrix_normal_t
+: <a class="el" href="dither_8h.html#febf0484e151cf3cce4ef0b9911d0022">dither.h</a>
+<li>stp_dither_matrix_short_t
+: <a class="el" href="dither_8h.html#9a2c54a4730e2c9bb25cf95f6cd3e597">dither.h</a>
+<li>stp_dotsize_t
+: <a class="el" href="dither_8h.html#7a74b9371fd47b48d961d2316e2126e4">dither.h</a>
+<li>stp_family_t
+: <a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">printers.h</a>
 <li>stp_fillfunc
 : <a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">weave.h</a>
 <li>stp_flushfunc
 : <a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">weave.h</a>
 <li>stp_free_data_func_t
 : <a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">vars.h</a>
+<li>stp_image_t
+: <a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">image.h</a>
 <li>stp_list_item_t
 : <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">list.h</a>
 <li>stp_list_t
 : <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">list.h</a>
+<li>stp_module_t
+: <a class="el" href="module_8h.html#e1e92953e8ffaa00cfbf7fc01e51f36d">module.h</a>
+<li>stp_module_version_t
+: <a class="el" href="module_8h.html#753a8450e5ac6b73134c12b89533f16e">module.h</a>
+<li>stp_mxml_attr_t
+: <a class="el" href="mxml_8h.html#b271ad8c2bb8d7e6b4b453ffe5589564">mxml.h</a>
+<li>stp_mxml_element_t
+: <a class="el" href="mxml_8h.html#70e20b752807f49a56b56d80ee470b47">mxml.h</a>
 <li>stp_mxml_node_t
 : <a class="el" href="mxml_8h.html#8fb80a78e3ac8d8aa9eb14c35326bd82">mxml.h</a>
+<li>stp_mxml_text_t
+: <a class="el" href="mxml_8h.html#b9c0236a2d70c3bcb210a9f6fadf00a3">mxml.h</a>
 <li>stp_mxml_type_t
 : <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">mxml.h</a>
+<li>stp_mxml_value_t
+: <a class="el" href="mxml_8h.html#9a2e2ffccac3c73524e76f3e816d35bf">mxml.h</a>
 <li>stp_node_copyfunc
 : <a class="el" href="group__list.html#g8d8084abc24eb4b00290916d5ff44c1f">list.h</a>
 <li>stp_node_freefunc
@@ -78,6 +119,8 @@
 : <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">printers.h</a>
 <li>stp_sequence_t
 : <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">sequence.h</a>
+<li>stp_shade_t
+: <a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">dither.h</a>
 <li>stp_string_list_t
 : <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">string-list.h</a>
 <li>stp_vars_t
@@ -85,8 +128,9 @@
 <li>stp_xml_parse_func
 : <a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">xml.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index f037ffd..6bda2c6 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -4,33 +4,36 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li class="current"><a href="globals_vars.html"><span>Variables</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li class="current"><a href="globals_vars.html"><span>Variables</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 &nbsp;
 <p>
 <ul>
@@ -59,8 +62,9 @@
 <li>stp_pack_uncompressed
 : <a class="el" href="weave_8h.html#561a5fd614c279fdc9ea9c14c7a5b540">weave.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 76c4605..3c35da2 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>array</h1>The array is a simple "two-dimensional array of numbers" data structure.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -513,8 +516,9 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 30179fb..5a734a4 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -4,59 +4,81 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>color</h1>The color data type is responsible for providing colour conversion features.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
+
+<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="#g68c13c36d723e5604507bf33fe629f8b"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="#g3b8f62108f3604480e7b89b253527f4a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="#g68ba525119da39ae854645ae649557d3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#g5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color__t.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#g612389b45f09358f6bad0e376c91b057"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The color data type is responsible for providing colour conversion features. 
 <p>
-Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles). <hr><h2>Function Documentation</h2>
+Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles). <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="gd1408f9835b72f266ec7c7e1e1202a74"></a><!-- doxytag: member="color.h::stp_color_t" ref="gd1408f9835b72f266ec7c7e1e1202a74" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__color.html">stp_color</a>  <a class="el" href="structstp__color.html">stp_color_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr><h2>Function Documentation</h2>
 <a class="anchor" name="g68c13c36d723e5604507bf33fe629f8b"></a><!-- doxytag: member="color.h::stp_color_count" ref="g68c13c36d723e5604507bf33fe629f8b" args="(void)" -->
 <div class="memitem">
 <div class="memproto">
@@ -122,7 +144,7 @@ Get the number of available color modules.
         <tr>
           <td class="memname">const char* stp_color_get_long_name           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>c</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -150,7 +172,7 @@ Get the long (translated) name of a color module.
         <tr>
           <td class="memname">const char* stp_color_get_name           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>c</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -184,7 +206,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -225,7 +247,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -274,7 +296,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="memname">int stp_color_register           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>color</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -294,7 +316,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="memname">int stp_color_unregister           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color__t.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>color</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -312,7 +334,7 @@ Get the short (untranslated) name of a color module.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color__t.html">stp_color_t</a>* stp_get_color_by_colorfuncs           </td>
+          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_colorfuncs           </td>
           <td>(</td>
           <td class="paramtype"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td>
           <td class="paramname"> <em>colorfuncs</em>          </td>
@@ -332,7 +354,7 @@ Get the short (untranslated) name of a color module.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color__t.html">stp_color_t</a>* stp_get_color_by_index           </td>
+          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_index           </td>
           <td>(</td>
           <td class="paramtype">int&nbsp;</td>
           <td class="paramname"> <em>idx</em>          </td>
@@ -360,7 +382,7 @@ Get a color module by its index number.
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color__t.html">stp_color_t</a>* stp_get_color_by_name           </td>
+          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_name           </td>
           <td>(</td>
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
@@ -383,8 +405,9 @@ Get a color module by its name.
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index 49b1107..611e7c0 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>curve</h1>The curve type models a linear, spline or gamma curve.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -2153,8 +2156,9 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index dd7de37..e069a85 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -4,26 +4,32 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>image</h1>The image type is an abstract data type for interfacing with the image creation program.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html">stp_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image__t.html#_details">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
 
+<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
+
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
 <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
@@ -31,19 +37,19 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#g58672e1989d582c14328048b207657c8">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
@@ -65,6 +71,22 @@ The image type is an abstract data type for interfacing with the image creation
 The maximum number of channels. 
 </div>
 </div><p>
+<hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="gae0b5ef92b619849a51cb75d376a90fb"></a><!-- doxytag: member="image.h::stp_image_t" ref="gae0b5ef92b619849a51cb75d376a90fb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__image.html">stp_image</a>  <a class="el" href="structstp__image.html">stp_image_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="g58672e1989d582c14328048b207657c8"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="g58672e1989d582c14328048b207657c8" args="" -->
 <div class="memitem">
@@ -99,7 +121,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname">void stp_image_conclude           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -119,7 +141,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname">const char* stp_image_get_appname           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -139,7 +161,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> stp_image_get_row           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
@@ -180,7 +202,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname">int stp_image_height           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -200,7 +222,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname">void stp_image_init           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -220,7 +242,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname">void stp_image_reset           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -240,7 +262,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td class="memname">int stp_image_width           </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
           <td width="100%"></td>
@@ -253,8 +275,9 @@ An error occured, or the job was aborted. </td></tr>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 556b80b..58d30c3 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>intl</h1>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -189,8 +192,9 @@ The macros defined in this header are convenience wrappers around the gettext fu
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index 231fea0..ec7cc9c 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>intl-internal</h1>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -189,8 +192,9 @@ The macros defined in this header are convenience wrappers around the gettext fu
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index 9b13585..69d084e 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -4,22 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>list</h1>The list data type implements a fast generic doubly-linked list.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="#g67b4fafe1ab6ead5be7500f88874bdb0"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
@@ -1059,8 +1061,9 @@ This callback function will be called to determine the sort order for list items
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index 4d3db0b..1eae6f5 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>papersize</h1>The papersize describes the dimensions of a paper.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -43,11 +46,15 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="#g1484a5e75a2b2921bbe0c9e17deb0b77"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g879cd515ca2eb5fd8cd76ae62f4bfa4e">stp_get_papersize_by_size_exact</a> (int length, int width)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size if an exact match is found.  <a href="#g879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#gb2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default paper dimensions for the current configuration.  <a href="#g33c0be56646361b1ce85a9d338336dd3"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The papersize describes the dimensions of a paper. 
@@ -146,6 +153,15 @@ Metric units (optional paper, not displayed by default).
 <div class="memdoc">
 
 <p>
+Get the default paper dimensions for the current configuration. 
+<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. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the Gutenprint vars object </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>pointer to storage that the width will be returned in. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>pointer to storage that the height will be returned in. </td></tr>
+  </table>
+</dl>
 
 </div>
 </div><p>
@@ -173,7 +189,7 @@ Get a papersize by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div><p>
@@ -201,7 +217,7 @@ Get a papersize by name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the short unique name of the paper. </td></tr>
   </table>
 </dl>
-<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div><p>
@@ -233,13 +249,51 @@ Get a papersize by name.
 <p>
 Get a papersize by size. 
 <p>
-The nearest available size to the size requested will be found. <dl compact><dt><b>Parameters:</b></dt><dd>
+The nearest available size to the size requested will be found. Only paper sizes within 5 points of width and height will be considered. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>length</em>&nbsp;</td><td>the length of the paper. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>the width of the paper </td></tr>
+  </table>
+</dl>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size_exact" ref="g879cd515ca2eb5fd8cd76ae62f4bfa4e" args="(int length, int width)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_size_exact           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>length</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Get a papersize by size if an exact match is found. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>length</em>&nbsp;</td><td>the length of the paper. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>the width of the paper </td></tr>
   </table>
 </dl>
-<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div><p>
@@ -266,8 +320,9 @@ Get the number of available papersizes.
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 977f4dd..9ededd5 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -4,29 +4,33 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>printer</h1>The printer type represents a printer model.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family__t.html">stp_family_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#gcddc2ce7fa4e0a68fcc30c123503738f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
+
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
 
@@ -66,14 +70,17 @@ stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#g4f6859e0f21ed2062075d6b9f680a202"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="#gf5084888feed9878811ac491cb5313ee"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameters to their defaults.  <a href="#gf5084888feed9878811ac491cb5313ee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc2ed6f27e4db29ceaa74a1b9bd6a78cf">stp_set_printer_defaults_soft</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set any unset parameters to their defaults.  <a href="#gc2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="#g6065874cbb246875925e14d8801898cc"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="#g31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="#ge61d056dd504facc72ff56d7f16eb23c"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
@@ -100,6 +107,21 @@ stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 The printer type represents a printer model. 
 <p>
 A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g66a5e7cf2b1743a46bd78cb851e1d0a4"></a><!-- doxytag: member="printers.h::stp_family_t" ref="g66a5e7cf2b1743a46bd78cb851e1d0a4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__family.html">stp_family</a>  <a class="el" href="structstp__family.html">stp_family_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="gcddc2ce7fa4e0a68fcc30c123503738f"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="gcddc2ce7fa4e0a68fcc30c123503738f" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -151,7 +173,7 @@ The printer opaque data type (representation of printer model).
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -438,7 +460,7 @@ Get the printer index number from the printer model short (driver) name.
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -736,7 +758,44 @@ Get the number of available printer models.
 <div class="memdoc">
 
 <p>
-Set a vars object to use a particular driver, and set the parameter to its defaults. 
+Set a vars object to use a particular driver, and set the parameters to their defaults. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gc2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults_soft" ref="gc2ed6f27e4db29ceaa74a1b9bd6a78cf" args="(stp_vars_t *v, const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_set_printer_defaults_soft           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Set a vars object to use a particular driver, and set any unset parameters to their defaults. 
 <p>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
@@ -760,7 +819,7 @@ Set a vars object to use a particular driver, and set the parameter to its defau
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image__t.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -806,8 +865,9 @@ Start a print job.
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index b2eedc6..69ce1ba 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -4,22 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>sequence</h1>The sequence is a simple "vector of numbers" data structure.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="#g327a46aa1d782a4cd53abf306068e272"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -1326,8 +1328,9 @@ Set the data in a sequence from unsigned short values.
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index 94f21b3..0930a8f 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>util</h1>Utility functions.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -62,6 +65,8 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&nbsp;&nbsp;&nbsp;0x200000</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga447450ea502f96203aa2c47f6e49e92">STP_DBG_NO_COMPRESSION</a>&nbsp;&nbsp;&nbsp;0x400000</td></tr>
+
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -322,6 +327,21 @@ Utility functions.
 
 </div>
 </div><p>
+<a class="anchor" name="ga447450ea502f96203aa2c47f6e49e92"></a><!-- doxytag: member="util.h::STP_DBG_NO_COMPRESSION" ref="ga447450ea502f96203aa2c47f6e49e92" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STP_DBG_NO_COMPRESSION&nbsp;&nbsp;&nbsp;0x400000          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="gd5eeaeabba7a0a861ae0dc936057aabd"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="gd5eeaeabba7a0a861ae0dc936057aabd" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -1445,8 +1465,9 @@ This function sets the encoding that all strings translated by gettext are outpu
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index 99cc1d4..0773287 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -4,16 +4,19 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>vars</h1>The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -35,6 +38,8 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4f46af65b4df5881b980acba32a05b70">STP_CHANNEL_NONE</a>&nbsp;&nbsp;&nbsp;((unsigned char) -1)</td></tr>
+
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
 
@@ -52,8 +57,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> )(void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br>
@@ -360,33 +364,69 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="#g11b79add82faf23b0e3c758f9530d95c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g390f7c2fe642bea08507374a184de233">stp_clear_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a parameter.  <a href="#g390f7c2fe642bea08507374a184de233"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g110e543418842a6dd79149409620bf13">stp_list_string_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all string parameters.  <a href="#g110e543418842a6dd79149409620bf13"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g76c7e033078e6c2fa276ee72ca97c63c">stp_list_file_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all file parameters.  <a href="#g76c7e033078e6c2fa276ee72ca97c63c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdec4183ce240188ed18fdc21d9b518f7">stp_list_float_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all float parameters.  <a href="#gdec4183ce240188ed18fdc21d9b518f7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge08d29a439b77219f32d037ab5b191f5">stp_list_int_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all integer parameters.  <a href="#ge08d29a439b77219f32d037ab5b191f5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5cae4a118badc7c52e5f7b7543c83d8e">stp_list_dimension_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all dimension parameters.  <a href="#g5cae4a118badc7c52e5f7b7543c83d8e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g60f98e23144fd1bf5aa53def670b2c91">stp_list_boolean_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#g6ed828e872f7678a89e1b065d377112e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all boolean parameters.  <a href="#g60f98e23144fd1bf5aa53def670b2c91"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1329d614d6cd18fc6c244b020e26b081">stp_list_curve_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#gaecd310feb8bd9a2188a9b287656aa1a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all curve parameters.  <a href="#g1329d614d6cd18fc6c244b020e26b081"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g16d23d59368e907a29719f0902ea75fe">stp_list_array_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#g15a5458adea6ad4eecda3c990acbc6cb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all array parameters.  <a href="#g16d23d59368e907a29719f0902ea75fe"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d06ccaf72d08800f7eb78b3293f4a00">stp_list_raw_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#g7487203059e7ccd71c4673656b3042b1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all raw parameters.  <a href="#g4d06ccaf72d08800f7eb78b3293f4a00"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g27864133bc2159d1472cbdfb3b781c27">stp_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#g0f6e91baac5e78703b162e9d23c0a65c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all parameters.  <a href="#g27864133bc2159d1472cbdfb3b781c27"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9f06e27ce5b6808d30c6fc01558db3b">stp_set_string_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#g9ad15a73dd8c755a8b80edbe335285ee"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#gc9f06e27ce5b6808d30c6fc01558db3b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0628a3f1feb7db7b5b10249a2b4f2412">stp_set_file_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ge7f21b118a8dfb5607334a6141d5dc5c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#g0628a3f1feb7db7b5b10249a2b4f2412"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g49e5b05ba7bf8ccf6e95cb744f4f0f93">stp_set_float_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#gb78f4273798c6e3e720afe01680cf752"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#g49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0cc1a26e8c3d502024c55a065fd5629a">stp_set_int_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#g364fcdb2e57b8ca99867c94954cf14cd"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#g0cc1a26e8c3d502024c55a065fd5629a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g28feceb75f731d6de08d1fdad1fc269e">stp_set_dimension_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#g28feceb75f731d6de08d1fdad1fc269e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3b74af22c776ddebd6b70455e196fe1c">stp_set_boolean_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#g3b74af22c776ddebd6b70455e196fe1c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0486744f97114ba03d4f8f7562d6c739">stp_set_curve_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#g0486744f97114ba03d4f8f7562d6c739"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d13479ad3669ec9b8d7dcc109bc8e7d">stp_set_array_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#g4d13479ad3669ec9b8d7dcc109bc8e7d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g47b8c3b31693ecdef420160b40b23a0d">stp_set_raw_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#g47b8c3b31693ecdef420160b40b23a0d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5ececd1972a375e1e569ed4a242ed1ed">stp_set_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a parameter.  <a href="#g5ececd1972a375e1e569ed4a242ed1ed"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#g8189b61073bfcd0244d5d6f2a2c8ba86"></a><br></td></tr>
@@ -414,6 +454,9 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#g285f05c648724c80bf05af30f87120a3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga416ba26ede5046db94b54b9d846e329">stp_check_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a parameter is set.  <a href="#ga416ba26ede5046db94b54b9d846e329"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#g0b7be7ba9f763be692dd833a434ed13d"></a><br></td></tr>
@@ -441,6 +484,9 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#gb6e41a5edb7474ed7ac26e236e00c80c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g31b32d5481a838276f23cfa4bc010c03">stp_get_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a parameter.  <a href="#g31b32d5481a838276f23cfa4bc010c03"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="#gc9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br></td></tr>
@@ -484,6 +530,21 @@ The vars data type contains all the information about a print job, this includes
 <p>
 Most of these job options are expressed as parameters which vary according to the model and other options selected.<p>
 The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="g4f46af65b4df5881b980acba32a05b70"></a><!-- doxytag: member="vars.h::STP_CHANNEL_NONE" ref="g4f46af65b4df5881b980acba32a05b70" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STP_CHANNEL_NONE&nbsp;&nbsp;&nbsp;((unsigned char) -1)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="g9fc3819cba14f7f4c5654508a08a1adf"></a><!-- doxytag: member="vars.h::STP_RAW" ref="g9fc3819cba14f7f4c5654508a08a1adf" args="(x)" -->
 <div class="memitem">
 <div class="memproto">
@@ -1163,6 +1224,57 @@ Check if an integer parameter is set.
 
 </div>
 </div><p>
+<a class="anchor" name="ga416ba26ede5046db94b54b9d846e329"></a><!-- doxytag: member="vars.h::stp_check_parameter" ref="ga416ba26ede5046db94b54b9d846e329" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_check_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Check if a parameter is set. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>type</em>&nbsp;</td><td>the type of the parameter. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
 <a class="anchor" name="g285f05c648724c80bf05af30f87120a3"></a><!-- doxytag: member="vars.h::stp_check_raw_parameter" ref="g285f05c648724c80bf05af30f87120a3" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
@@ -1510,6 +1622,50 @@ Clear (remove) an integer parameter.
 
 </div>
 </div><p>
+<a class="anchor" name="g390f7c2fe642bea08507374a184de233"></a><!-- doxytag: member="vars.h::stp_clear_parameter" ref="g390f7c2fe642bea08507374a184de233" args="(stp_vars_t *v, const char *parameter, stp_parameter_type_t type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_clear_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Clear a parameter. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>type</em>&nbsp;</td><td>the type of the parameter. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
 <a class="anchor" name="g11b79add82faf23b0e3c758f9530d95c"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="g11b79add82faf23b0e3c758f9530d95c" args="(stp_vars_t *v, const char *parameter)" -->
 <div class="memitem">
 <div class="memproto">
@@ -2759,6 +2915,50 @@ Get the page width.
 
 </div>
 </div><p>
+<a class="anchor" name="g31b32d5481a838276f23cfa4bc010c03"></a><!-- doxytag: member="vars.h::stp_get_parameter_active" ref="g31b32d5481a838276f23cfa4bc010c03" args="(const stp_vars_t *v, const char *parameter, stp_parameter_type_t type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Get the activity status of a parameter. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>type</em>&nbsp;</td><td>the type of the parameter. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
 <a class="anchor" name="g12e8bb617e5c90da99d6d74519664634"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="g12e8bb617e5c90da99d6d74519664634" args="(const stp_vars_t *v)" -->
 <div class="memitem">
 <div class="memproto">
@@ -3063,6 +3263,286 @@ Get the width edge of the image.
 
 </div>
 </div><p>
+<a class="anchor" name="g16d23d59368e907a29719f0902ea75fe"></a><!-- doxytag: member="vars.h::stp_list_array_parameters" ref="g16d23d59368e907a29719f0902ea75fe" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_array_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all array parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g60f98e23144fd1bf5aa53def670b2c91"></a><!-- doxytag: member="vars.h::stp_list_boolean_parameters" ref="g60f98e23144fd1bf5aa53def670b2c91" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_boolean_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all boolean parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g1329d614d6cd18fc6c244b020e26b081"></a><!-- doxytag: member="vars.h::stp_list_curve_parameters" ref="g1329d614d6cd18fc6c244b020e26b081" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_curve_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all curve parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5cae4a118badc7c52e5f7b7543c83d8e"></a><!-- doxytag: member="vars.h::stp_list_dimension_parameters" ref="g5cae4a118badc7c52e5f7b7543c83d8e" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_dimension_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all dimension parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g76c7e033078e6c2fa276ee72ca97c63c"></a><!-- doxytag: member="vars.h::stp_list_file_parameters" ref="g76c7e033078e6c2fa276ee72ca97c63c" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_file_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all file parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gdec4183ce240188ed18fdc21d9b518f7"></a><!-- doxytag: member="vars.h::stp_list_float_parameters" ref="gdec4183ce240188ed18fdc21d9b518f7" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_float_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all float parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge08d29a439b77219f32d037ab5b191f5"></a><!-- doxytag: member="vars.h::stp_list_int_parameters" ref="ge08d29a439b77219f32d037ab5b191f5" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_int_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all integer parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g27864133bc2159d1472cbdfb3b781c27"></a><!-- doxytag: member="vars.h::stp_list_parameters" ref="g27864133bc2159d1472cbdfb3b781c27" args="(const stp_vars_t *v, stp_parameter_type_t type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>type</em>&nbsp;</td><td>the type of the parameter. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g4d06ccaf72d08800f7eb78b3293f4a00"></a><!-- doxytag: member="vars.h::stp_list_raw_parameters" ref="g4d06ccaf72d08800f7eb78b3293f4a00" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_raw_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all raw parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g110e543418842a6dd79149409620bf13"></a><!-- doxytag: member="vars.h::stp_list_string_parameters" ref="g110e543418842a6dd79149409620bf13" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_list_string_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+List all string parameters. 
+<p>
+The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
 <a class="anchor" name="g086303d36b835d539e75f16187e99e8f"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="g086303d36b835d539e75f16187e99e8f" args="(stp_vars_t *user, const stp_vars_t *print)" -->
 <div class="memitem">
 <div class="memproto">
@@ -3510,14 +3990,14 @@ Set an array parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="gb78f4273798c6e3e720afe01680cf752"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="gb78f4273798c6e3e720afe01680cf752" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g4d13479ad3669ec9b8d7dcc109bc8e7d"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="g4d13479ad3669ec9b8d7dcc109bc8e7d" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_array_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3598,14 +4078,14 @@ Set a boolean parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="g9ad15a73dd8c755a8b80edbe335285ee"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="g9ad15a73dd8c755a8b80edbe335285ee" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g3b74af22c776ddebd6b70455e196fe1c"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="g3b74af22c776ddebd6b70455e196fe1c" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_boolean_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3767,14 +4247,14 @@ Set a curve parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="ge7f21b118a8dfb5607334a6141d5dc5c"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="ge7f21b118a8dfb5607334a6141d5dc5c" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g0486744f97114ba03d4f8f7562d6c739"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="g0486744f97114ba03d4f8f7562d6c739" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_curve_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4360,14 +4840,14 @@ Set a dimension parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="g0f6e91baac5e78703b162e9d23c0a65c"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="g0f6e91baac5e78703b162e9d23c0a65c" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g28feceb75f731d6de08d1fdad1fc269e"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="g28feceb75f731d6de08d1fdad1fc269e" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_dimension_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4603,14 +5083,14 @@ Set a file parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="gaecd310feb8bd9a2188a9b287656aa1a"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="gaecd310feb8bd9a2188a9b287656aa1a" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g0628a3f1feb7db7b5b10249a2b4f2412"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="g0628a3f1feb7db7b5b10249a2b4f2412" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_file_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4742,14 +5222,14 @@ Set a float parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="g15a5458adea6ad4eecda3c990acbc6cb"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="g15a5458adea6ad4eecda3c990acbc6cb" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="g49e5b05ba7bf8ccf6e95cb744f4f0f93" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_float_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4867,14 +5347,14 @@ Set an integer parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="g7487203059e7ccd71c4673656b3042b1"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="g7487203059e7ccd71c4673656b3042b1" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g0cc1a26e8c3d502024c55a065fd5629a"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="g0cc1a26e8c3d502024c55a065fd5629a" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_int_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5096,6 +5576,57 @@ Set the page width.
 
 </div>
 </div><p>
+<a class="anchor" name="g5ececd1972a375e1e569ed4a242ed1ed"></a><!-- doxytag: member="vars.h::stp_set_parameter_active" ref="g5ececd1972a375e1e569ed4a242ed1ed" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_set_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Set the activity of a parameter. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>type</em>&nbsp;</td><td>the type of the parameter. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
 <a class="anchor" name="g0155de75bf2aa95ab45a3319539cda56"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter" ref="g0155de75bf2aa95ab45a3319539cda56" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" -->
 <div class="memitem">
 <div class="memproto">
@@ -5147,14 +5678,14 @@ Set a raw parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="g364fcdb2e57b8ca99867c94954cf14cd"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="g364fcdb2e57b8ca99867c94954cf14cd" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="g47b8c3b31693ecdef420160b40b23a0d"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="g47b8c3b31693ecdef420160b40b23a0d" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_raw_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5235,14 +5766,14 @@ Set a string parameter.
 
 </div>
 </div><p>
-<a class="anchor" name="g6ed828e872f7678a89e1b065d377112e"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="g6ed828e872f7678a89e1b065d377112e" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" name="gc9f06e27ce5b6808d30c6fc01558db3b"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="gc9f06e27ce5b6808d30c6fc01558db3b" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_set_string_parameter_active           </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5611,8 +6142,9 @@ Verify that the parameters selected are consistent with those allowed by the dri
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index a2fa187..88cc521 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -4,31 +4,34 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>version</h1>Version information.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(1)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(98)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(1)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(3)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
@@ -127,7 +130,7 @@ Version information may be used to check the library version at compile-time, us
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_INTERFACE_AGE&nbsp;&nbsp;&nbsp;(0)          </td>
+          <td class="memname">#define STP_INTERFACE_AGE&nbsp;&nbsp;&nbsp;(3)          </td>
         </tr>
       </table>
 </div>
@@ -157,7 +160,7 @@ Version information may be used to check the library version at compile-time, us
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(98)          </td>
+          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(1)          </td>
         </tr>
       </table>
 </div>
@@ -172,7 +175,7 @@ Version information may be used to check the library version at compile-time, us
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MINOR_VERSION&nbsp;&nbsp;&nbsp;(1)          </td>
+          <td class="memname">#define STP_MINOR_VERSION&nbsp;&nbsp;&nbsp;(2)          </td>
         </tr>
       </table>
 </div>
@@ -331,8 +334,9 @@ The library minor version number.
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </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 b798049..93a797b 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/gutenprint-intl-internal.h File Reference</h1><code>#include &lt;locale.h&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/gutenprint-intl-internal.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;locale.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
@@ -34,8 +39,11 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Internationalisation functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Internationalisation functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index a4c9aab..2973696 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/gutenprint-intl.h File Reference</h1><code>#include &lt;locale.h&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/gutenprint-intl.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;locale.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
@@ -34,8 +39,11 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Internationalisation functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Internationalisation functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index 28650a4..070292b 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/gutenprint-module.h File Reference</h1><code>#include &lt;<a class="el" href="gutenprint_8h.html">gutenprint/gutenprint.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/gutenprint-module.h File Reference</h1>Gutenprint module header. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="gutenprint_8h.html">gutenprint/gutenprint.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="bit-ops_8h.html">gutenprint/bit-ops.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="channel_8h.html">gutenprint/channel.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="color_8h.html">gutenprint/color.h</a>&gt;</code><br>
@@ -31,7 +36,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Gutenprint module header. This header includes all of the public headers used by modules. <hr><h2>Define Documentation</h2>
+Gutenprint module header. 
+<p>
+This header includes all of the public headers used by modules. <hr><h2>Define Documentation</h2>
 <a class="anchor" name="38fcab54351f45a3968822e2747aff6b"></a><!-- doxytag: member="gutenprint-module.h::STP_MODULE" ref="38fcab54351f45a3968822e2747aff6b" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -47,8 +54,9 @@ Gutenprint module header. This header includes all of the public headers used by
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index fc82c4f..0b38040 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -4,30 +4,35 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/gutenprint-version.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/gutenprint-version.h File Reference</h1>Version functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(1)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(98)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(1)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(3)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
@@ -56,8 +61,11 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Version functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Version functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 52edc32..e7a3df2 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/gutenprint.h File Reference</h1><code>#include &lt;stddef.h&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/gutenprint.h File Reference</h1>Gutenprint master header. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;stddef.h&gt;</code><br>
 <code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;<a class="el" href="array_8h.html">gutenprint/array.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
@@ -30,8 +35,11 @@
 <tr><td></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Gutenprint master header. This header includes all of the public headers. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Gutenprint master header. 
+<p>
+This header includes all of the public headers. </div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index efaea41..10e5901 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -4,25 +4,33 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/image.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/image.h File Reference</h1>Image functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html">stp_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image__t.html#_details">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
 
+<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
+
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
 <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
@@ -30,24 +38,27 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#g58672e1989d582c14328048b207657c8">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Image functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Image functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 37abafd..49c8e79 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -4,20 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<h3 align="center">5.1.98.2 </h3><hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+<h3 align="center">5.2.1 </h3></div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index dff2909..41370e3 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -4,21 +4,25 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/list.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/list.h File Reference</h1>Generic list functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
@@ -117,8 +121,11 @@ stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" h
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Generic list functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Generic list functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 1a4992e..f79efd8 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -4,23 +4,33 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<h1>include/gutenprint/module.h File Reference</h1><code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprint/module.h File Reference</h1>Module functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version__t.html">stp_module_version_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html">stp_module_version</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html">stp_module</a></td></tr>
+
+<tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#753a8450e5ac6b73134c12b89533f16e">stp_module_version_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html">stp_module_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__module.html">stp_module</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#e1e92953e8ffaa00cfbf7fc01e51f36d">stp_module_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> { <br>
@@ -48,7 +58,40 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Module functions. <hr><h2>Enumeration Type Documentation</h2>
+Module functions. 
+<p>
+<hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="e1e92953e8ffaa00cfbf7fc01e51f36d"></a><!-- doxytag: member="module.h::stp_module_t" ref="e1e92953e8ffaa00cfbf7fc01e51f36d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__module.html">stp_module</a>  <a class="el" href="structstp__module.html">stp_module_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="753a8450e5ac6b73134c12b89533f16e"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="753a8450e5ac6b73134c12b89533f16e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>  <a class="el" href="structstp__module__version.html">stp_module_version_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="b3da7c3525c26e1d63d7fe1f95da5a42" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -199,8 +242,9 @@ Module functions. <hr><h2>Enumeration Type Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index acb48c4..fdb3007 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -4,17 +4,20 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li class="current"><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>libgutenprint API Reference Modules</h1>Here is a list of all modules:<ul>
+<div class="contents">
+<h1>Modules</h1>Here is a list of all modules:<ul>
 <li><a class="el" href="group__array.html">array</a>
 <li><a class="el" href="group__color.html">color</a>
 <li><a class="el" href="group__curve.html">curve</a>
@@ -29,8 +32,9 @@
 <li><a class="el" href="group__util.html">util</a>
 <li><a class="el" href="group__vars.html">vars</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 1df8b83..d6be019 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<h1>include/gutenprint/mxml.h File Reference</h1><code>#include &lt;stdio.h&gt;</code><br>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprint/mxml.h File Reference</h1>Mini-XML XML parsing functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;stdlib.h&gt;</code><br>
 <code>#include &lt;string.h&gt;</code><br>
 <code>#include &lt;ctype.h&gt;</code><br>
@@ -22,13 +27,13 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">union &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">union &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a></td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td></tr>
 
@@ -62,11 +67,17 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#5c364d2523fb6f7a133df3fdfd7f44d5">STP_MXML_ADD_TO_PARENT</a>&nbsp;&nbsp;&nbsp;NULL</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <br>
-<a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#b271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#b9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a> { <br>
@@ -92,6 +103,8 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#88f8bf556fb254728ab23ce931ee9224">stp_mxmlLoadFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7fbf0906a36fe755779077efd7126704">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#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
+
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#4a2465973559fe7815386d0d59d9a8ee">stp_mxmlLoadString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#9430b1f2b1d6b6060d9e358309de3772">stp_mxmlNewElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
@@ -110,6 +123,8 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1038b1003e9a3fbd8396cdbe989a64c8">stp_mxmlSaveFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ee3de9dc6a961f11238960d1dd1ea5c3">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" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#054f6b6df45f2e0072a61c1a438d3ebe">stp_mxmlSaveString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#f478d00f31cfae58314bd6f40531923b">stp_mxmlWalkNext</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
@@ -118,7 +133,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
+Mini-XML XML parsing functions. 
+<p>
+<hr><h2>Define Documentation</h2>
 <a class="anchor" name="a046bb0b67f278cb7ffdd0be5336b4f3"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="a046bb0b67f278cb7ffdd0be5336b4f3" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -330,6 +347,36 @@ Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 </div>
 </div><p>
 <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="b271ad8c2bb8d7e6b4b453ffe5589564"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="b271ad8c2bb8d7e6b4b453ffe5589564" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>  <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="70e20b752807f49a56b56d80ee470b47"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="70e20b752807f49a56b56d80ee470b47" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>  <a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="8fb80a78e3ac8d8aa9eb14c35326bd82"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="8fb80a78e3ac8d8aa9eb14c35326bd82" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -345,6 +392,21 @@ Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="b9c0236a2d70c3bcb210a9f6fadf00a3"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="b9c0236a2d70c3bcb210a9f6fadf00a3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>  <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="3ff7086c4e8f1557e81c32a61420017e"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="3ff7086c4e8f1557e81c32a61420017e" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -360,6 +422,21 @@ Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="9a2e2ffccac3c73524e76f3e816d35bf"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="9a2e2ffccac3c73524e76f3e816d35bf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>  <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6ba"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="f8b58610b5fb382d0f075cb3bcf3b6ba" args="" -->
 <div class="memitem">
@@ -604,6 +681,41 @@ Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="7fbf0906a36fe755779077efd7126704"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFromFile" ref="7fbf0906a36fe755779077efd7126704" args="(stp_mxml_node_t *top, const char *file, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
+<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>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>top</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>file</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="4a2465973559fe7815386d0d59d9a8ee"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadString" ref="4a2465973559fe7815386d0d59d9a8ee" args="(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
 <div class="memitem">
 <div class="memproto">
@@ -915,6 +1027,41 @@ Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="ee3de9dc6a961f11238960d1dd1ea5c3"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveToFile" ref="ee3de9dc6a961f11238960d1dd1ea5c3" args="(stp_mxml_node_t *node, const char *fp, int(*cb)(stp_mxml_node_t *, int))" -->
+<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> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>fp</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)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="f478d00f31cfae58314bd6f40531923b"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkNext" ref="f478d00f31cfae58314bd6f40531923b" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" -->
 <div class="memitem">
 <div class="memproto">
@@ -985,8 +1132,9 @@ Mini-XML XML parsing functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index c4f1473..2f3cdbc 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -4,22 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li class="current"><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>libgutenprint API Reference Related Pages</h1>Here is a list of all related documentation pages:<ul>
+<div class="contents">
+<h1>Related Pages</h1>Here is a list of all related documentation pages:<ul>
 <li><a class="el" href="deprecated.html">Deprecated List</a>
 
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index ff288ca..e5cc5f5 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/paper.h File Reference</h1><code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/paper.h File Reference</h1>Paper size functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
@@ -43,15 +48,22 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g879cd515ca2eb5fd8cd76ae62f4bfa4e">stp_get_papersize_by_size_exact</a> (int length, int width)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size if an exact match is found.  <a href="group__papersize.html#g879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default paper dimensions for the current configuration.  <a href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Paper size functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Paper size functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index 477cbe2..5056bfb 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -4,26 +4,39 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/path.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/path.h File Reference</h1>Simple directory path functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#b1754e7b09717741f4bdc7a4b973d4a5">stp_path_search</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#f08851d96a1197c5ce39f7dc812cef3f">stp_path_split</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *path)</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#26017fec6cd9c9e44bc58b4cac9b9c35">stpi_data_path</a> (void)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#037cae76d9cb1916ec7fa711a127fe54">stpi_list_files_on_data_path</a> (const char *name)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#17eca69c41eb6cca959ab47e3c1a3aa2">stpi_path_merge</a> (const char *path, const char *file)</td></tr>
+
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Simple directory path functions. <hr><h2>Function Documentation</h2>
+Simple directory path functions. 
+<p>
+<hr><h2>Function Documentation</h2>
 <a class="anchor" name="b1754e7b09717741f4bdc7a4b973d4a5"></a><!-- doxytag: member="path.h::stp_path_search" ref="b1754e7b09717741f4bdc7a4b973d4a5" args="(stp_list_t *dirlist, const char *suffix)" -->
 <div class="memitem">
 <div class="memproto">
@@ -82,8 +95,78 @@ Simple directory path functions. <hr><h2>Function Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+<a class="anchor" name="26017fec6cd9c9e44bc58b4cac9b9c35"></a><!-- doxytag: member="path.h::stpi_data_path" ref="26017fec6cd9c9e44bc58b4cac9b9c35" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stpi_data_path           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="037cae76d9cb1916ec7fa711a127fe54"></a><!-- doxytag: member="path.h::stpi_list_files_on_data_path" ref="037cae76d9cb1916ec7fa711a127fe54" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stpi_list_files_on_data_path           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="17eca69c41eb6cca959ab47e3c1a3aa2"></a><!-- doxytag: member="path.h::stpi_path_merge" ref="17eca69c41eb6cca959ab47e3c1a3aa2" args="(const char *path, const char *file)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* stpi_path_merge           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>path</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>file</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index 97d1d4a..6af6214 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/printers.h File Reference</h1><code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/printers.h File Reference</h1>Printer functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -22,13 +27,14 @@
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family__t.html">stp_family_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
+
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
 
@@ -68,14 +74,17 @@ stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#g4f6859e0f21ed2062075d6b9f680a202"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="group__printer.html#gf5084888feed9878811ac491cb5313ee"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameters to their defaults.  <a href="group__printer.html#gf5084888feed9878811ac491cb5313ee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc2ed6f27e4db29ceaa74a1b9bd6a78cf">stp_set_printer_defaults_soft</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set any unset parameters to their defaults.  <a href="group__printer.html#gc2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#g6065874cbb246875925e14d8801898cc"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
@@ -99,8 +108,11 @@ stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Printer functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Printer functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index ea91a17..f9fb8bb 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -4,21 +4,25 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/sequence.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/sequence.h File Reference</h1>Sequence functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -114,8 +118,11 @@ stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#g20007077e1d8365a0eddaa922a5967c3"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Sequence functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Sequence functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 4447ecd..263a9d7 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -4,25 +4,29 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/string-list.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<div class="contents">
+<h1>include/gutenprint/string-list.h File Reference</h1>String list functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">String parameter.  <a href="structstp__param__string__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The string_list opaque data type.  <a href="#5e3b69c7c2eca2523184cce51ca26543"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -48,7 +52,9 @@ stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el"
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-String list functions. <hr><h2>Typedef Documentation</h2>
+String list functions. 
+<p>
+<hr><h2>Typedef Documentation</h2>
 <a class="anchor" name="5e3b69c7c2eca2523184cce51ca26543"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="5e3b69c7c2eca2523184cce51ca26543" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -327,8 +333,9 @@ The string_list opaque data type.
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
new file mode 100644
index 0000000..ac41fe4
--- /dev/null
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -0,0 +1,296 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: dither_matrix_impl Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>dither_matrix_impl Struct Reference</h1><!-- doxytag: class="dither_matrix_impl" --><code>#include &lt;dither.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">base</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">exp</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">x_size</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">y_size</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">total_size</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">last_x</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">last_x_mod</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">last_y</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">last_y_mod</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">index</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">i_own</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">x_offset</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">y_offset</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">fast_mask</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">matrix</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="331debb887e076f8b52952ba6cc2b50b"></a><!-- doxytag: member="dither_matrix_impl::base" ref="331debb887e076f8b52952ba6cc2b50b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl::base</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="db0e7fb4b5e5149f0815af448676df8b"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="db0e7fb4b5e5149f0815af448676df8b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl::exp</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="063e3b3617c3a9b4883f3b01cd7dfb48"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="063e3b3617c3a9b4883f3b01cd7dfb48" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl::x_size</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="33370af30d4c6cb0e441744c8d1c3686"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="33370af30d4c6cb0e441744c8d1c3686" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl::y_size</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="54645c1c4edad222cf3f5aba03cdfae5"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="54645c1c4edad222cf3f5aba03cdfae5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl::total_size</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f0728348e6da1cf904204ef88e0a5853"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="f0728348e6da1cf904204ef88e0a5853" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl::last_x</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="16f516218f0c5a31a1eac49e5c57add5"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="16f516218f0c5a31a1eac49e5c57add5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl::last_x_mod</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="c1a83c82c364098dce631ec7174574be"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="c1a83c82c364098dce631ec7174574be" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl::last_y</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="d03881dd78211b5bcb1a62453c060d2e"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="d03881dd78211b5bcb1a62453c060d2e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl::last_y_mod</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="b744f40c883acc93ad0afbf5f048f27a"></a><!-- doxytag: member="dither_matrix_impl::index" ref="b744f40c883acc93ad0afbf5f048f27a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl::index</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="78152fe120c430f6400b731e5c722bd3"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="78152fe120c430f6400b731e5c722bd3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl::i_own</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="665c02056a2d046a15aab462492d9dbc"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="665c02056a2d046a15aab462492d9dbc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl::x_offset</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="844cb19ea61f035bc2a21536f6f392c4"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="844cb19ea61f035bc2a21536f6f392c4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl::y_offset</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="8c7141e2e35f6cc14896d23d15a81914"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="8c7141e2e35f6cc14896d23d15a81914" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl::fast_mask</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="e28102f9e3d3cfb8eb48d9e69e807f96"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="e28102f9e3d3cfb8eb48d9e69e807f96" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned* <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl::matrix</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </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 ad1b34c..a653508 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_cached_curve_t Struct Reference</h1><!-- doxytag: class="stp_cached_curve_t" --><code>#include &lt;curve-cache.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -98,8 +101,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
new file mode 100644
index 0000000..caa2ff0
--- /dev/null
+++ b/doc/gutenprint/html/structstp__color.html
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_color Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_color Struct Reference<br>
+<small>
+[<a class="el" href="group__color.html">color</a>]</small>
+</h1><!-- doxytag: class="stp_color" --><code>#include &lt;color.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">short_name</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">long_name</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">colorfuncs</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="23ed4d11629625e2ad24b124c36c7fab"></a><!-- doxytag: member="stp_color::short_name" ref="23ed4d11629625e2ad24b124c36c7fab" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color::short_name</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="b7c0a627b31ebfb97fd1db2677032479"></a><!-- doxytag: member="stp_color::long_name" ref="b7c0a627b31ebfb97fd1db2677032479" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color::long_name</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="4442d36d0bcf746130f82ffe6f90147f"></a><!-- doxytag: member="stp_color::colorfuncs" ref="4442d36d0bcf746130f82ffe6f90147f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color::colorfuncs</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__color__t.html b/doc/gutenprint/html/structstp__color__t.html
deleted file mode 100644
index fe30a91..0000000
--- a/doc/gutenprint/html/structstp__color__t.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_color_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_color_t Struct Reference<br>
-<small>
-[<a class="el" href="group__color.html">color</a>]</small>
-</h1><!-- doxytag: class="stp_color_t" --><code>#include &lt;color.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">short_name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">long_name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">colorfuncs</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="5a0f6f24bbb0048b8c4c0acec3f38500"></a><!-- doxytag: member="stp_color_t::short_name" ref="5a0f6f24bbb0048b8c4c0acec3f38500" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const char* <a class="el" href="structstp__color__t.html#5a0f6f24bbb0048b8c4c0acec3f38500">stp_color_t::short_name</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="9680717a1d04dbb522fd3eeb5b4f723b"></a><!-- doxytag: member="stp_color_t::long_name" ref="9680717a1d04dbb522fd3eeb5b4f723b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const char* <a class="el" href="structstp__color__t.html#9680717a1d04dbb522fd3eeb5b4f723b">stp_color_t::long_name</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="0ab4fc77eeb3eaedcea9c3a522fe5d57"></a><!-- doxytag: member="stp_color_t::colorfuncs" ref="0ab4fc77eeb3eaedcea9c3a522fe5d57" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color__t.html#0ab4fc77eeb3eaedcea9c3a522fe5d57">stp_color_t::colorfuncs</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index 2683398..b3535e0 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_colorfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -29,9 +32,9 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">init</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">init</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">get_row</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">get_row</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">list_parameters</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
@@ -44,7 +47,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, size_t steps)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)          </td>
         </tr>
       </table>
 </div>
@@ -59,7 +62,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image, int row, unsigned *zero_mask)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)          </td>
         </tr>
       </table>
 </div>
@@ -101,8 +104,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </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 8927cb3..51ea5f9 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_curve_point_t Struct Reference<br>
 <small>
 [<a class="el" href="group__curve.html">curve</a>]</small>
@@ -79,8 +82,9 @@ Vertical position.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html
new file mode 100644
index 0000000..3cb873e
--- /dev/null
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_dither_matrix_generic Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_dither_matrix_generic Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_generic" --><code>#include &lt;dither.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">x</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">y</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">bytes</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">prescaled</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">data</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="6b8bd1cc589c2195f055e5a57a05e03a"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="6b8bd1cc589c2195f055e5a57a05e03a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic::x</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="aaddcac2ca33a3e822ded567bbbecfb9"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="aaddcac2ca33a3e822ded567bbbecfb9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic::y</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="b963ddf7c0826bd3cc316c2375f1205b"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="b963ddf7c0826bd3cc316c2375f1205b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic::bytes</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="478d54ddf9ba50e783ddec1532a0eff6"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="478d54ddf9ba50e783ddec1532a0eff6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic::prescaled</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="52acbda296a57a6087852eab62bc62db"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="52acbda296a57a6087852eab62bc62db" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const void* <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic::data</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic__t.html b/doc/gutenprint/html/structstp__dither__matrix__generic__t.html
deleted file mode 100644
index 87d4704..0000000
--- a/doc/gutenprint/html/structstp__dither__matrix__generic__t.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_generic_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_dither_matrix_generic_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_generic_t" --><code>#include &lt;dither.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">x</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">y</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">bytes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">prescaled</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">data</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="44cd10631c067bb550173f14368bee2b"></a><!-- doxytag: member="stp_dither_matrix_generic_t::x" ref="44cd10631c067bb550173f14368bee2b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#44cd10631c067bb550173f14368bee2b">stp_dither_matrix_generic_t::x</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="2c8fdba16e3d594c2f929c521add0edb"></a><!-- doxytag: member="stp_dither_matrix_generic_t::y" ref="2c8fdba16e3d594c2f929c521add0edb" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#2c8fdba16e3d594c2f929c521add0edb">stp_dither_matrix_generic_t::y</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="ce2509068a38f137997f78ee5f86a3fd"></a><!-- doxytag: member="stp_dither_matrix_generic_t::bytes" ref="ce2509068a38f137997f78ee5f86a3fd" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#ce2509068a38f137997f78ee5f86a3fd">stp_dither_matrix_generic_t::bytes</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="21d0ef7610c911ac9638abc9abac81ad"></a><!-- doxytag: member="stp_dither_matrix_generic_t::prescaled" ref="21d0ef7610c911ac9638abc9abac81ad" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic__t.html#21d0ef7610c911ac9638abc9abac81ad">stp_dither_matrix_generic_t::prescaled</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="7a5ebd299bf32fb0711c4598610d05b2"></a><!-- doxytag: member="stp_dither_matrix_generic_t::data" ref="7a5ebd299bf32fb0711c4598610d05b2" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const void* <a class="el" href="structstp__dither__matrix__generic__t.html#7a5ebd299bf32fb0711c4598610d05b2">stp_dither_matrix_generic_t::data</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__impl__t.html b/doc/gutenprint/html/structstp__dither__matrix__impl__t.html
deleted file mode 100644
index e16a09a..0000000
--- a/doc/gutenprint/html/structstp__dither__matrix__impl__t.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_impl_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_dither_matrix_impl_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_impl_t" --><code>#include &lt;dither.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">base</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">exp</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">x_size</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">y_size</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">total_size</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">last_x</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">last_x_mod</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">last_y</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">last_y_mod</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">index</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">i_own</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">x_offset</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">y_offset</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">fast_mask</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">matrix</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="77db65014dea5548e6954ee4a76b7fd7"></a><!-- doxytag: member="stp_dither_matrix_impl_t::base" ref="77db65014dea5548e6954ee4a76b7fd7" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#77db65014dea5548e6954ee4a76b7fd7">stp_dither_matrix_impl_t::base</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="dfe3c9f5a067437a69bdd83d43f3f804"></a><!-- doxytag: member="stp_dither_matrix_impl_t::exp" ref="dfe3c9f5a067437a69bdd83d43f3f804" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#dfe3c9f5a067437a69bdd83d43f3f804">stp_dither_matrix_impl_t::exp</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="7ce1ac8940686b11ce88494bcc166c5b"></a><!-- doxytag: member="stp_dither_matrix_impl_t::x_size" ref="7ce1ac8940686b11ce88494bcc166c5b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#7ce1ac8940686b11ce88494bcc166c5b">stp_dither_matrix_impl_t::x_size</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="9cb8ed0493f8966e9929e1a966f0428c"></a><!-- doxytag: member="stp_dither_matrix_impl_t::y_size" ref="9cb8ed0493f8966e9929e1a966f0428c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#9cb8ed0493f8966e9929e1a966f0428c">stp_dither_matrix_impl_t::y_size</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="094613ce00d0a095a9affae11be304f7"></a><!-- doxytag: member="stp_dither_matrix_impl_t::total_size" ref="094613ce00d0a095a9affae11be304f7" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#094613ce00d0a095a9affae11be304f7">stp_dither_matrix_impl_t::total_size</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="f0bb4535de37f2f78378fda1c7228886"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_x" ref="f0bb4535de37f2f78378fda1c7228886" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#f0bb4535de37f2f78378fda1c7228886">stp_dither_matrix_impl_t::last_x</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="dd3deba1e7c232cb6d4890078dd14fe2"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_x_mod" ref="dd3deba1e7c232cb6d4890078dd14fe2" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#dd3deba1e7c232cb6d4890078dd14fe2">stp_dither_matrix_impl_t::last_x_mod</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="87a160f3b15be1e006f54dd840b31708"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_y" ref="87a160f3b15be1e006f54dd840b31708" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#87a160f3b15be1e006f54dd840b31708">stp_dither_matrix_impl_t::last_y</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="b14d418c4cd370f340b0a30ef0804952"></a><!-- doxytag: member="stp_dither_matrix_impl_t::last_y_mod" ref="b14d418c4cd370f340b0a30ef0804952" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#b14d418c4cd370f340b0a30ef0804952">stp_dither_matrix_impl_t::last_y_mod</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="808aaba40f97218310e7fec5f8ad3da1"></a><!-- doxytag: member="stp_dither_matrix_impl_t::index" ref="808aaba40f97218310e7fec5f8ad3da1" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#808aaba40f97218310e7fec5f8ad3da1">stp_dither_matrix_impl_t::index</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="1dc9e02e9c08c84879a4432efcfdef40"></a><!-- doxytag: member="stp_dither_matrix_impl_t::i_own" ref="1dc9e02e9c08c84879a4432efcfdef40" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#1dc9e02e9c08c84879a4432efcfdef40">stp_dither_matrix_impl_t::i_own</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="7a22d5818987bbcc0f77254c12519092"></a><!-- doxytag: member="stp_dither_matrix_impl_t::x_offset" ref="7a22d5818987bbcc0f77254c12519092" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#7a22d5818987bbcc0f77254c12519092">stp_dither_matrix_impl_t::x_offset</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="e975508a01d5d57d589edf14cb3e0bb0"></a><!-- doxytag: member="stp_dither_matrix_impl_t::y_offset" ref="e975508a01d5d57d589edf14cb3e0bb0" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__impl__t.html#e975508a01d5d57d589edf14cb3e0bb0">stp_dither_matrix_impl_t::y_offset</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="524c9ed01e5f7f07d03e808afbeb9883"></a><!-- doxytag: member="stp_dither_matrix_impl_t::fast_mask" ref="524c9ed01e5f7f07d03e808afbeb9883" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__dither__matrix__impl__t.html#524c9ed01e5f7f07d03e808afbeb9883">stp_dither_matrix_impl_t::fast_mask</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="80a41648eea9699edd5c90759caef00c"></a><!-- doxytag: member="stp_dither_matrix_impl_t::matrix" ref="80a41648eea9699edd5c90759caef00c" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">unsigned* <a class="el" href="structstp__dither__matrix__impl__t.html#80a41648eea9699edd5c90759caef00c">stp_dither_matrix_impl_t::matrix</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html
new file mode 100644
index 0000000..124a1e5
--- /dev/null
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_dither_matrix_normal Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_dither_matrix_normal Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_normal" --><code>#include &lt;dither.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">x</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">y</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">bytes</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">prescaled</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">data</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="b9564690be42859d88ea264a29321af3"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="b9564690be42859d88ea264a29321af3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal::x</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="410560f5186761cb7430f5b0a804b09c"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="410560f5186761cb7430f5b0a804b09c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal::y</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="d72d088edfe3223c2df8fd4fb6178b98"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="d72d088edfe3223c2df8fd4fb6178b98" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal::bytes</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="042561ad856d67506fe81b1bbbffd966"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="042561ad856d67506fe81b1bbbffd966" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal::prescaled</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="e67cb37136c5e9d9c4b1a44cd2dab87b"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="e67cb37136c5e9d9c4b1a44cd2dab87b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal::data</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal__t.html b/doc/gutenprint/html/structstp__dither__matrix__normal__t.html
deleted file mode 100644
index cd35790..0000000
--- a/doc/gutenprint/html/structstp__dither__matrix__normal__t.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_normal_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_dither_matrix_normal_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_normal_t" --><code>#include &lt;dither.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">x</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">y</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">bytes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">prescaled</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">data</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="be31b8f8dcc4c48be9c912ed720f63a6"></a><!-- doxytag: member="stp_dither_matrix_normal_t::x" ref="be31b8f8dcc4c48be9c912ed720f63a6" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#be31b8f8dcc4c48be9c912ed720f63a6">stp_dither_matrix_normal_t::x</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="2247e48b75c8f12fe091e1ce9d9bc14d"></a><!-- doxytag: member="stp_dither_matrix_normal_t::y" ref="2247e48b75c8f12fe091e1ce9d9bc14d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#2247e48b75c8f12fe091e1ce9d9bc14d">stp_dither_matrix_normal_t::y</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="4e85b66600eecdb606761d97e8263931"></a><!-- doxytag: member="stp_dither_matrix_normal_t::bytes" ref="4e85b66600eecdb606761d97e8263931" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#4e85b66600eecdb606761d97e8263931">stp_dither_matrix_normal_t::bytes</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="04fe7e891c1cb7b4e36b640d29d2616b"></a><!-- doxytag: member="stp_dither_matrix_normal_t::prescaled" ref="04fe7e891c1cb7b4e36b640d29d2616b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal__t.html#04fe7e891c1cb7b4e36b640d29d2616b">stp_dither_matrix_normal_t::prescaled</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="9c84f2864c2f2a07739e87030659b86d"></a><!-- doxytag: member="stp_dither_matrix_normal_t::data" ref="9c84f2864c2f2a07739e87030659b86d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const unsigned* <a class="el" href="structstp__dither__matrix__normal__t.html#9c84f2864c2f2a07739e87030659b86d">stp_dither_matrix_normal_t::data</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html
new file mode 100644
index 0000000..6e7d917
--- /dev/null
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_dither_matrix_short Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_dither_matrix_short Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_short" --><code>#include &lt;dither.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">x</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">y</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">bytes</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">prescaled</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">data</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="81e0b20e763080b79faa837a00cac832"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="81e0b20e763080b79faa837a00cac832" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short::x</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="2bbc6c72006541250ba23b48bcab60e8"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="2bbc6c72006541250ba23b48bcab60e8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short::y</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="d4d85727401505eab74e3e667f4a38f4"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="d4d85727401505eab74e3e667f4a38f4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short::bytes</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="755361acae80fa4cba01a1cc71638274"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="755361acae80fa4cba01a1cc71638274" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short::prescaled</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f4f6b5634ea79cf694782e35a8d7607d"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="f4f6b5634ea79cf694782e35a8d7607d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short::data</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short__t.html b/doc/gutenprint/html/structstp__dither__matrix__short__t.html
deleted file mode 100644
index fe15461..0000000
--- a/doc/gutenprint/html/structstp__dither__matrix__short__t.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dither_matrix_short_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_dither_matrix_short_t Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_short_t" --><code>#include &lt;dither.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">x</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">y</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">bytes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">prescaled</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">data</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="f3e1cc731d40f28a67b7cba541f341f5"></a><!-- doxytag: member="stp_dither_matrix_short_t::x" ref="f3e1cc731d40f28a67b7cba541f341f5" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#f3e1cc731d40f28a67b7cba541f341f5">stp_dither_matrix_short_t::x</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="32c82f9dc3fd5fe381a0c5cd6abb073d"></a><!-- doxytag: member="stp_dither_matrix_short_t::y" ref="32c82f9dc3fd5fe381a0c5cd6abb073d" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#32c82f9dc3fd5fe381a0c5cd6abb073d">stp_dither_matrix_short_t::y</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="f16fe3d197917c57878a7eb47fb74f89"></a><!-- doxytag: member="stp_dither_matrix_short_t::bytes" ref="f16fe3d197917c57878a7eb47fb74f89" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#f16fe3d197917c57878a7eb47fb74f89">stp_dither_matrix_short_t::bytes</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="5cad2ace098daefb612a316c80013c19"></a><!-- doxytag: member="stp_dither_matrix_short_t::prescaled" ref="5cad2ace098daefb612a316c80013c19" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short__t.html#5cad2ace098daefb612a316c80013c19">stp_dither_matrix_short_t::prescaled</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="e809b6e6f3abfb477fc01c959050976b"></a><!-- doxytag: member="stp_dither_matrix_short_t::data" ref="e809b6e6f3abfb477fc01c959050976b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const unsigned short* <a class="el" href="structstp__dither__matrix__short__t.html#e809b6e6f3abfb477fc01c959050976b">stp_dither_matrix_short_t::data</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
new file mode 100644
index 0000000..46d1f6b
--- /dev/null
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_dotsize Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_dotsize Struct Reference</h1><!-- doxytag: class="stp_dotsize" --><code>#include &lt;dither.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">bit_pattern</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">value</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="8d5273395d0e27004f779de0ea81ff23"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="8d5273395d0e27004f779de0ea81ff23" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize::bit_pattern</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="d259e8d169a7d140e4964b80790c7ddd"></a><!-- doxytag: member="stp_dotsize::value" ref="d259e8d169a7d140e4964b80790c7ddd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize::value</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__dotsize__t.html b/doc/gutenprint/html/structstp__dotsize__t.html
deleted file mode 100644
index 17ff67d..0000000
--- a/doc/gutenprint/html/structstp__dotsize__t.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_dotsize_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_dotsize_t Struct Reference</h1><!-- doxytag: class="stp_dotsize_t" --><code>#include &lt;dither.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">bit_pattern</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">value</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="1b77e2dff6771aeeb5ebccdc23a04314"></a><!-- doxytag: member="stp_dotsize_t::bit_pattern" ref="1b77e2dff6771aeeb5ebccdc23a04314" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__dotsize__t.html#1b77e2dff6771aeeb5ebccdc23a04314">stp_dotsize_t::bit_pattern</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="59531e49199b2adacf0944a7ac47359e"></a><!-- doxytag: member="stp_dotsize_t::value" ref="59531e49199b2adacf0944a7ac47359e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">double <a class="el" href="structstp__dotsize__t.html#59531e49199b2adacf0944a7ac47359e">stp_dotsize_t::value</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html
index c526ea0..0b1d9a2 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_double_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -73,8 +76,9 @@ Upper bound.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family__t.html b/doc/gutenprint/html/structstp__family.html
index aff6bb2..277d0b5 100644
--- a/doc/gutenprint/html/structstp__family__t.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -1,46 +1,49 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_family_t Struct Reference</title>
+<title>libgutenprint API Reference: stp_family Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_family_t Struct Reference<br>
+<div class="contents">
+<h1>stp_family Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
-</h1><!-- doxytag: class="stp_family_t" --><code>#include &lt;printers.h&gt;</code>
+</h1><!-- doxytag: class="stp_family" --><code>#include &lt;printers.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">printfuncs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">printfuncs</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">printer_list</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">printer_list</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="393a6a8182a6ef2e56ef87ea620ef868"></a><!-- doxytag: member="stp_family_t::printfuncs" ref="393a6a8182a6ef2e56ef87ea620ef868" args="" -->
+<a class="anchor" name="d29f00ba3565e93c138b00e4a48cde77"></a><!-- doxytag: member="stp_family::printfuncs" ref="d29f00ba3565e93c138b00e4a48cde77" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family__t.html#393a6a8182a6ef2e56ef87ea620ef868">stp_family_t::printfuncs</a>          </td>
+          <td class="memname">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family::printfuncs</a>          </td>
         </tr>
       </table>
 </div>
@@ -50,12 +53,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="8b71d91daeb9b00d7b0ee3fe28509fe7"></a><!-- doxytag: member="stp_family_t::printer_list" ref="8b71d91daeb9b00d7b0ee3fe28509fe7" args="" -->
+<a class="anchor" name="6e4f0c216f5ced14a819fbacdb26547d"></a><!-- doxytag: member="stp_family::printer_list" ref="6e4f0c216f5ced14a819fbacdb26547d" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* <a class="el" href="structstp__family__t.html#8b71d91daeb9b00d7b0ee3fe28509fe7">stp_family_t::printer_list</a>          </td>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* <a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">stp_family::printer_list</a>          </td>
         </tr>
       </table>
 </div>
@@ -67,8 +70,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image__t.html b/doc/gutenprint/html/structstp__image.html
index 7543d00..60a4d34 100644
--- a/doc/gutenprint/html/structstp__image__t.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -1,30 +1,33 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_image_t Struct Reference</title>
+<title>libgutenprint API Reference: stp_image Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_image_t Struct Reference<br>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_image Struct Reference<br>
 <small>
 [<a class="el" href="group__image.html">image</a>]</small>
-</h1><!-- doxytag: class="stp_image_t" -->The image type is an abstract data type for interfacing with the image creation program.  
+</h1><!-- doxytag: class="stp_image" -->The image type is an abstract data type for interfacing with the image creation program.  
 <a href="#_details">More...</a>
 <p>
 <code>#include &lt;image.h&gt;</code>
@@ -32,41 +35,41 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">init</a> )(struct stp_image *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#96e9c2c9f040fbc66abab45a4b2a79b0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">reset</a> )(struct stp_image *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#ce69bf25344a814cabea38afa4527086"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#ce331fd802c9c7c65a6538c03aecc0b3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">width</a> )(struct stp_image *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#7bb2244368c6b1e07d27afb3dd249ffd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#e120f940a46eeb9d8f6a28b03cea88c0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">height</a> )(struct stp_image *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#890033525988e15f4f4a0b4132e5f19b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#687ae4bce9980985adfce7a15af38cde"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">get_row</a> )(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#4977ad211581999a3f3290983929cce9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#d490679a2b158fcec555d54d7e9bc528"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">get_appname</a> )(struct stp_image *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#8f7f8fb5826f52b8bd820f422c583350"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#c8184c887110641206044785fae3f46d"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">conclude</a> )(struct stp_image *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#56636ad7c0dbf0a82284241f796d95cd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#75a8a76ab6d78ba767b21e5ed95827a7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">rep</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#5d2385711b303e055258c28f42ab7f4c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">rep</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#e5ba3d09714043232aef970d245182ee"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#b18e6ee35037589bf485213022e2d871"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
 It provides callbacks to functions defined within the client application which are called while printing the image. <hr><h2>Field Documentation</h2>
-<a class="anchor" name="96e9c2c9f040fbc66abab45a4b2a79b0"></a><!-- doxytag: member="stp_image_t::init" ref="96e9c2c9f040fbc66abab45a4b2a79b0" args=")(struct stp_image *image)" -->
+<a class="anchor" name="ce69bf25344a814cabea38afa4527086"></a><!-- doxytag: member="stp_image::init" ref="ce69bf25344a814cabea38afa4527086" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__image__t.html#96e9c2c9f040fbc66abab45a4b2a79b0">stp_image_t::init</a>)(struct stp_image *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">stp_image::init</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -83,12 +86,12 @@ It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
 
 </div>
 </div><p>
-<a class="anchor" name="ce331fd802c9c7c65a6538c03aecc0b3"></a><!-- doxytag: member="stp_image_t::reset" ref="ce331fd802c9c7c65a6538c03aecc0b3" args=")(struct stp_image *image)" -->
+<a class="anchor" name="7bb2244368c6b1e07d27afb3dd249ffd"></a><!-- doxytag: member="stp_image::reset" ref="7bb2244368c6b1e07d27afb3dd249ffd" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3">stp_image_t::reset</a>)(struct stp_image *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -97,7 +100,7 @@ It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
 <p>
 This callback is called to reset the image to the beginning. 
 <p>
-It may (in principle) be called multiple times if a page is being printed more than once. <dl class="warning" compact><dt><b>Warning:</b></dt><dd>The <a class="el" href="structstp__image__t.html#ce331fd802c9c7c65a6538c03aecc0b3" title="This callback is called to reset the image to the beginning.">reset()</a> call may be removed in the future. </dd></dl>
+It may (in principle) be called multiple times if a page is being printed more than once. <dl class="warning" compact><dt><b>Warning:</b></dt><dd>The <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd" title="This callback is called to reset the image to the beginning.">reset()</a> call may be removed in the future. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
@@ -106,12 +109,12 @@ It may (in principle) be called multiple times if a page is being printed more t
 
 </div>
 </div><p>
-<a class="anchor" name="e120f940a46eeb9d8f6a28b03cea88c0"></a><!-- doxytag: member="stp_image_t::width" ref="e120f940a46eeb9d8f6a28b03cea88c0" args=")(struct stp_image *image)" -->
+<a class="anchor" name="890033525988e15f4f4a0b4132e5f19b"></a><!-- doxytag: member="stp_image::width" ref="890033525988e15f4f4a0b4132e5f19b" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0">stp_image_t::width</a>)(struct stp_image *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -128,12 +131,12 @@ This callback returns the width of the image in pixels.
 
 </div>
 </div><p>
-<a class="anchor" name="687ae4bce9980985adfce7a15af38cde"></a><!-- doxytag: member="stp_image_t::height" ref="687ae4bce9980985adfce7a15af38cde" args=")(struct stp_image *image)" -->
+<a class="anchor" name="4977ad211581999a3f3290983929cce9"></a><!-- doxytag: member="stp_image::height" ref="4977ad211581999a3f3290983929cce9" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__image__t.html#687ae4bce9980985adfce7a15af38cde">stp_image_t::height</a>)(struct stp_image *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -150,12 +153,12 @@ This callback returns the height of the image in pixels.
 
 </div>
 </div><p>
-<a class="anchor" name="d490679a2b158fcec555d54d7e9bc528"></a><!-- doxytag: member="stp_image_t::get_row" ref="d490679a2b158fcec555d54d7e9bc528" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" -->
+<a class="anchor" name="8f7f8fb5826f52b8bd820f422c583350"></a><!-- doxytag: member="stp_image::get_row" ref="8f7f8fb5826f52b8bd820f422c583350" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(* <a class="el" href="structstp__image__t.html#d490679a2b158fcec555d54d7e9bc528">stp_image_t::get_row</a>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)          </td>
+          <td class="memname"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(* <a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">stp_image::get_row</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)          </td>
         </tr>
       </table>
 </div>
@@ -164,10 +167,10 @@ This callback returns the height of the image in pixels.
 <p>
 This callback transfers the data from the image to the gimp-print library. 
 <p>
-It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0" title="This callback returns the width of the image in pixels.">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). <dl compact><dt><b>Parameters:</b></dt><dd>
+It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b" title="This callback returns the width of the image in pixels.">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image__t.html#e120f940a46eeb9d8f6a28b03cea88c0" title="This callback returns the width of the image in pixels.">width()</a> bytes of pixel data. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b" title="This callback returns the width of the image in pixels.">width()</a> bytes of pixel data. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>byte_limit</em>&nbsp;</td><td>(image width * number of channels). </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>row</em>&nbsp;</td><td>(unused). </td></tr>
   </table>
@@ -175,12 +178,12 @@ It is called from the driver layer. It should copy WIDTH (as returned by the <a
 
 </div>
 </div><p>
-<a class="anchor" name="c8184c887110641206044785fae3f46d"></a><!-- doxytag: member="stp_image_t::get_appname" ref="c8184c887110641206044785fae3f46d" args=")(struct stp_image *image)" -->
+<a class="anchor" name="56636ad7c0dbf0a82284241f796d95cd"></a><!-- doxytag: member="stp_image::get_appname" ref="56636ad7c0dbf0a82284241f796d95cd" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char*(* <a class="el" href="structstp__image__t.html#c8184c887110641206044785fae3f46d">stp_image_t::get_appname</a>)(struct stp_image *image)          </td>
+          <td class="memname">const char*(* <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -192,12 +195,12 @@ This callback returns the name of the application.
 This is embedded in the output by some drivers. 
 </div>
 </div><p>
-<a class="anchor" name="75a8a76ab6d78ba767b21e5ed95827a7"></a><!-- doxytag: member="stp_image_t::conclude" ref="75a8a76ab6d78ba767b21e5ed95827a7" args=")(struct stp_image *image)" -->
+<a class="anchor" name="5d2385711b303e055258c28f42ab7f4c"></a><!-- doxytag: member="stp_image::conclude" ref="5d2385711b303e055258c28f42ab7f4c" args=")(struct stp_image *image)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__image__t.html#75a8a76ab6d78ba767b21e5ed95827a7">stp_image_t::conclude</a>)(struct stp_image *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -209,12 +212,12 @@ This callback is called at the end of each page.
 
 </div>
 </div><p>
-<a class="anchor" name="e5ba3d09714043232aef970d245182ee"></a><!-- doxytag: member="stp_image_t::rep" ref="e5ba3d09714043232aef970d245182ee" args="" -->
+<a class="anchor" name="b18e6ee35037589bf485213022e2d871"></a><!-- doxytag: member="stp_image::rep" ref="b18e6ee35037589bf485213022e2d871" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__image__t.html#e5ba3d09714043232aef970d245182ee">stp_image_t::rep</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image::rep</a>          </td>
         </tr>
       </table>
 </div>
@@ -228,8 +231,9 @@ A pointer to an application-specific state information that might need to be ass
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="image_8h.html">image.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </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 84137f0..9a7a172 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_int_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -73,8 +76,9 @@ Upper bound.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index bd2b84f..e792273 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_lineactive_t Struct Reference</h1><!-- doxytag: class="stp_lineactive_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -64,8 +67,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index ba498ad..ced8248 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_linebounds_t Struct Reference</h1><!-- doxytag: class="stp_linebounds_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -81,8 +84,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index 6a69210..c76571f 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_linebufs_t Struct Reference</h1><!-- doxytag: class="stp_linebufs_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -64,8 +67,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index a0807bd..32998aa 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_linecount_t Struct Reference</h1><!-- doxytag: class="stp_linecount_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -64,8 +67,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 4b6624b..a237e3f 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_lineoff_t Struct Reference</h1><!-- doxytag: class="stp_lineoff_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -64,8 +67,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__t.html b/doc/gutenprint/html/structstp__module.html
index ce0f4ed..c82bf76 100644
--- a/doc/gutenprint/html/structstp__module__t.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -1,55 +1,58 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_module_t Struct Reference</title>
+<title>libgutenprint API Reference: stp_module Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_module_t Struct Reference</h1><!-- doxytag: class="stp_module_t" --><code>#include &lt;module.h&gt;</code>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_module Struct Reference</h1><!-- doxytag: class="stp_module" --><code>#include &lt;module.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">version</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">comment</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">comment</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">handle</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">handle</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">init</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">init</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">fini</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">fini</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">syms</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">syms</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="87a2ab51de6f6860ac0803c0d8114bd7"></a><!-- doxytag: member="stp_module_t::name" ref="87a2ab51de6f6860ac0803c0d8114bd7" args="" -->
+<a class="anchor" name="32e2db7046f281afd6748afe111aee76"></a><!-- doxytag: member="stp_module::name" ref="32e2db7046f281afd6748afe111aee76" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module__t.html#87a2ab51de6f6860ac0803c0d8114bd7">stp_module_t::name</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module::name</a>          </td>
         </tr>
       </table>
 </div>
@@ -59,12 +62,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="b5ec864c9d2932872dd2ba62c53ba813"></a><!-- doxytag: member="stp_module_t::version" ref="b5ec864c9d2932872dd2ba62c53ba813" args="" -->
+<a class="anchor" name="e2038239913d3ddbece919082501c8d0"></a><!-- doxytag: member="stp_module::version" ref="e2038239913d3ddbece919082501c8d0" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module__t.html#b5ec864c9d2932872dd2ba62c53ba813">stp_module_t::version</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module::version</a>          </td>
         </tr>
       </table>
 </div>
@@ -74,12 +77,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="66daab38c5658cdffd0ebd3c68e3b326"></a><!-- doxytag: member="stp_module_t::comment" ref="66daab38c5658cdffd0ebd3c68e3b326" args="" -->
+<a class="anchor" name="b60ac536d9ec7b3a306cddf4c06e18bb"></a><!-- doxytag: member="stp_module::comment" ref="b60ac536d9ec7b3a306cddf4c06e18bb" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module__t.html#66daab38c5658cdffd0ebd3c68e3b326">stp_module_t::comment</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module::comment</a>          </td>
         </tr>
       </table>
 </div>
@@ -89,12 +92,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="1bd300254cbc047d2c00688cd7777aa3"></a><!-- doxytag: member="stp_module_t::class" ref="1bd300254cbc047d2c00688cd7777aa3" args="" -->
+<a class="anchor" name="4ebc727be1ec8edaaa1b25415a3932e3"></a><!-- doxytag: member="stp_module::class" ref="4ebc727be1ec8edaaa1b25415a3932e3" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> <a class="el" href="structstp__module__t.html#1bd300254cbc047d2c00688cd7777aa3">stp_module_t::class</a>          </td>
+          <td class="memname"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> <a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">stp_module::class</a>          </td>
         </tr>
       </table>
 </div>
@@ -104,12 +107,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="f1b13d76a5b44839e773b7ddaf7e73c5"></a><!-- doxytag: member="stp_module_t::handle" ref="f1b13d76a5b44839e773b7ddaf7e73c5" args="" -->
+<a class="anchor" name="1a96aa2db220972e124717cc6dd03c8e"></a><!-- doxytag: member="stp_module::handle" ref="1a96aa2db220972e124717cc6dd03c8e" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__module__t.html#f1b13d76a5b44839e773b7ddaf7e73c5">stp_module_t::handle</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module::handle</a>          </td>
         </tr>
       </table>
 </div>
@@ -119,12 +122,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="12d502ea2386865bc05fd659bebb974f"></a><!-- doxytag: member="stp_module_t::init" ref="12d502ea2386865bc05fd659bebb974f" args=")(void)" -->
+<a class="anchor" name="fa7d4259940b8d42a36f14108f504944"></a><!-- doxytag: member="stp_module::init" ref="fa7d4259940b8d42a36f14108f504944" args=")(void)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__module__t.html#12d502ea2386865bc05fd659bebb974f">stp_module_t::init</a>)(void)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module::init</a>)(void)          </td>
         </tr>
       </table>
 </div>
@@ -134,12 +137,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="2b0e0c7ba523ac34f6a085a3eaaa33f4"></a><!-- doxytag: member="stp_module_t::fini" ref="2b0e0c7ba523ac34f6a085a3eaaa33f4" args=")(void)" -->
+<a class="anchor" name="e04ff0565f8ebd56b383917b602ffc4a"></a><!-- doxytag: member="stp_module::fini" ref="e04ff0565f8ebd56b383917b602ffc4a" args=")(void)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__module__t.html#2b0e0c7ba523ac34f6a085a3eaaa33f4">stp_module_t::fini</a>)(void)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module::fini</a>)(void)          </td>
         </tr>
       </table>
 </div>
@@ -149,12 +152,12 @@
 
 </div>
 </div><p>
-<a class="anchor" name="a9ecb04bec44f6348ccb9c86c1330405"></a><!-- doxytag: member="stp_module_t::syms" ref="a9ecb04bec44f6348ccb9c86c1330405" args="" -->
+<a class="anchor" name="0e7297a93920d8f6849718d0a32fa2ba"></a><!-- doxytag: member="stp_module::syms" ref="0e7297a93920d8f6849718d0a32fa2ba" args="" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__module__t.html#a9ecb04bec44f6348ccb9c86c1330405">stp_module_t::syms</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module::syms</a>          </td>
         </tr>
       </table>
 </div>
@@ -166,8 +169,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
new file mode 100644
index 0000000..26cde32
--- /dev/null
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_module_version Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_module_version Struct Reference</h1><!-- doxytag: class="stp_module_version" --><code>#include &lt;module.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">major</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">minor</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="15add43e03d0e1624f40c083fa958692"></a><!-- doxytag: member="stp_module_version::major" ref="15add43e03d0e1624f40c083fa958692" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version::major</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="eced49a93c5e461fa95f809ad077fced"></a><!-- doxytag: member="stp_module_version::minor" ref="eced49a93c5e461fa95f809ad077fced" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version::minor</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__module__version__t.html b/doc/gutenprint/html/structstp__module__version__t.html
deleted file mode 100644
index 699447e..0000000
--- a/doc/gutenprint/html/structstp__module__version__t.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_module_version_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_module_version_t Struct Reference</h1><!-- doxytag: class="stp_module_version_t" --><code>#include &lt;module.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">major</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">minor</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="3395d816d8cb9603ae00220ba74b0d94"></a><!-- doxytag: member="stp_module_version_t::major" ref="3395d816d8cb9603ae00220ba74b0d94" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__module__version__t.html#3395d816d8cb9603ae00220ba74b0d94">stp_module_version_t::major</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="616356e2cc969782c10a138dfa06af42"></a><!-- doxytag: member="stp_module_version_t::minor" ref="616356e2cc969782c10a138dfa06af42" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__module__version__t.html#616356e2cc969782c10a138dfa06af42">stp_module_version_t::minor</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html
new file mode 100644
index 0000000..6e88f55
--- /dev/null
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_mxml_attr_s Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_mxml_attr_s Struct Reference</h1><!-- doxytag: class="stp_mxml_attr_s" --><code>#include &lt;mxml.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">name</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">value</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="4ea32ac1f797cf7722bf3e8638b21dee"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="4ea32ac1f797cf7722bf3e8638b21dee" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s::name</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="25554324bd8ccf8e9558e4705eda0daa"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="25554324bd8ccf8e9558e4705eda0daa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s::value</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__t.html b/doc/gutenprint/html/structstp__mxml__attr__t.html
deleted file mode 100644
index b224ab1..0000000
--- a/doc/gutenprint/html/structstp__mxml__attr__t.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_attr_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_mxml_attr_t Struct Reference</h1><!-- doxytag: class="stp_mxml_attr_t" --><code>#include &lt;mxml.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">value</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="37d8a0891b88e9bbc89f873dfb097682"></a><!-- doxytag: member="stp_mxml_attr_t::name" ref="37d8a0891b88e9bbc89f873dfb097682" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__attr__t.html#37d8a0891b88e9bbc89f873dfb097682">stp_mxml_attr_t::name</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="9a5667da7d27fa347051fe5f80aeca0e"></a><!-- doxytag: member="stp_mxml_attr_t::value" ref="9a5667da7d27fa347051fe5f80aeca0e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__attr__t.html#9a5667da7d27fa347051fe5f80aeca0e">stp_mxml_attr_t::value</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__mxml__element__t.html b/doc/gutenprint/html/structstp__mxml__element__t.html
deleted file mode 100644
index ec0a2bb..0000000
--- a/doc/gutenprint/html/structstp__mxml__element__t.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_element_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_mxml_element_t Struct Reference</h1><!-- doxytag: class="stp_mxml_element_t" --><code>#include &lt;mxml.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">num_attrs</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">attrs</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="e678ef57706b8b2a5676612e4d5849c4"></a><!-- doxytag: member="stp_mxml_element_t::name" ref="e678ef57706b8b2a5676612e4d5849c4" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__element__t.html#e678ef57706b8b2a5676612e4d5849c4">stp_mxml_element_t::name</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="d016326e925b78b7c6b951f33500184a"></a><!-- doxytag: member="stp_mxml_element_t::num_attrs" ref="d016326e925b78b7c6b951f33500184a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__mxml__element__t.html#d016326e925b78b7c6b951f33500184a">stp_mxml_element_t::num_attrs</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="347605ee2ec9846e6d9f56a1b80a5901"></a><!-- doxytag: member="stp_mxml_element_t::attrs" ref="347605ee2ec9846e6d9f56a1b80a5901" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__attr__t.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__element__t.html#347605ee2ec9846e6d9f56a1b80a5901">stp_mxml_element_t::attrs</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html
index 2a4c044..9e97bdc 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>stp_mxml_node_s Struct Reference</h1><!-- doxytag: class="stp_mxml_node_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -38,7 +41,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">last_child</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
@@ -137,7 +140,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="unionstp__mxml__value__t.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s::value</a>          </td>
+          <td class="memname"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s::value</a>          </td>
         </tr>
       </table>
 </div>
@@ -149,8 +152,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html
new file mode 100644
index 0000000..8eee9c6
--- /dev/null
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_mxml_text_s Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_mxml_text_s Struct Reference</h1><!-- doxytag: class="stp_mxml_text_s" --><code>#include &lt;mxml.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">whitespace</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">string</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="76bcfbb8c3de4e1c597468d51ef47184"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="76bcfbb8c3de4e1c597468d51ef47184" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s::whitespace</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="ef1865e8cab7d5ab175c6e67f122be15"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="ef1865e8cab7d5ab175c6e67f122be15" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s::string</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__mxml__text__t.html b/doc/gutenprint/html/structstp__mxml__text__t.html
deleted file mode 100644
index 5383a74..0000000
--- a/doc/gutenprint/html/structstp__mxml__text__t.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_text_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_mxml_text_t Struct Reference</h1><!-- doxytag: class="stp_mxml_text_t" --><code>#include &lt;mxml.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">whitespace</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">string</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="10493f8ced34febc9dafc554df0a9db8"></a><!-- doxytag: member="stp_mxml_text_t::whitespace" ref="10493f8ced34febc9dafc554df0a9db8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__mxml__text__t.html#10493f8ced34febc9dafc554df0a9db8">stp_mxml_text_t::whitespace</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="82078f046e2331d07df9de1a6d526885"></a><!-- doxytag: member="stp_mxml_text_t::string" ref="82078f046e2331d07df9de1a6d526885" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__text__t.html#82078f046e2331d07df9de1a6d526885">stp_mxml_text_t::string</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html
new file mode 100644
index 0000000..610885f
--- /dev/null
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_mxml_value_s Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_mxml_value_s Struct Reference</h1><!-- doxytag: class="stp_mxml_value_s" --><code>#include &lt;mxml.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">name</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">num_attrs</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">attrs</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="959d5315fd98119aa5d23d2b8d307c58"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="959d5315fd98119aa5d23d2b8d307c58" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s::name</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f29b9bbc769c278dad18ff2cb098ef6a"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="f29b9bbc769c278dad18ff2cb098ef6a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s::num_attrs</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="69974b612f59fd3ef1d5db85db2d1a07"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="69974b612f59fd3ef1d5db85db2d1a07" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s::attrs</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index 0e06248..2599f3d 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_papersize_t Struct Reference<br>
 <small>
 [<a class="el" href="group__papersize.html">papersize</a>]</small>
@@ -259,8 +262,9 @@ Paper size type.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </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 6866a04..264df15 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_param_string_t Struct Reference</h1><!-- doxytag: class="stp_param_string_t" -->String parameter.  
 <a href="#_details">More...</a>
 <p>
@@ -70,8 +73,9 @@ Human-readable (translated) text.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index aed202f..4dad2d8 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>stp_parameter_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -502,8 +505,9 @@ Default value of the parameter.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index fab04eb..1f6deba 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_pass_t Struct Reference</h1><!-- doxytag: class="stp_pass_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -132,8 +135,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index 076be2e..a9a41a8 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_printfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -41,7 +44,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#36e471ee24b92cfd67390a025cbc427e">limit</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">print</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">print</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#18e0da9638360173e0d75d839ce72b92">describe_resolution</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
@@ -49,9 +52,9 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">verify</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">start_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">start_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">end_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">end_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#1aee9299429a813e60c7c131ccf93c74">get_external_options</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
@@ -152,7 +155,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -212,7 +215,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -227,7 +230,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image__t.html">stp_image_t</a> *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
 </div>
@@ -254,8 +257,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index b1913ec..3f5673b 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stp_raw_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -73,8 +76,9 @@ Raw data.
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
new file mode 100644
index 0000000..094dac6
--- /dev/null
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_shade Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_shade Struct Reference</h1><!-- doxytag: class="stp_shade" --><code>#include &lt;dither.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">value</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">numsizes</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">dot_sizes</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="07a72426c7bcbf22f1cc253a97a453d4"></a><!-- doxytag: member="stp_shade::value" ref="07a72426c7bcbf22f1cc253a97a453d4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade::value</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="8e68774d99e3eecb76f06f7704f1eb90"></a><!-- doxytag: member="stp_shade::numsizes" ref="8e68774d99e3eecb76f06f7704f1eb90" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade::numsizes</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="5057a856d4a6f7095af66b8cefc3cdc3"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="5057a856d4a6f7095af66b8cefc3cdc3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">stp_shade::dot_sizes</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/structstp__shade__t.html b/doc/gutenprint/html/structstp__shade__t.html
deleted file mode 100644
index 5f0b641..0000000
--- a/doc/gutenprint/html/structstp__shade__t.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_shade_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_shade_t Struct Reference</h1><!-- doxytag: class="stp_shade_t" --><code>#include &lt;dither.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">value</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">numsizes</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">dot_sizes</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="d43f8713d01af090ecb910a8b5538125"></a><!-- doxytag: member="stp_shade_t::value" ref="d43f8713d01af090ecb910a8b5538125" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">double <a class="el" href="structstp__shade__t.html#d43f8713d01af090ecb910a8b5538125">stp_shade_t::value</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="06cdc2392609bb5e0fd731b02ad7dc1b"></a><!-- doxytag: member="stp_shade_t::numsizes" ref="06cdc2392609bb5e0fd731b02ad7dc1b" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="structstp__shade__t.html#06cdc2392609bb5e0fd731b02ad7dc1b">stp_shade_t::numsizes</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="7ab08079ac4667939bfebfc1454101e8"></a><!-- doxytag: member="stp_shade_t::dot_sizes" ref="7ab08079ac4667939bfebfc1454101e8" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">const <a class="el" href="structstp__dotsize__t.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade__t.html#7ab08079ac4667939bfebfc1454101e8">stp_shade_t::dot_sizes</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index 439e1ef..181235b 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -4,23 +4,26 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>stp_weave_t Struct Reference</h1><!-- doxytag: class="stp_weave_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -149,8 +152,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/tabs.css b/doc/gutenprint/html/tabs.css
index c37faaf..95f00a9 100644
--- a/doc/gutenprint/html/tabs.css
+++ b/doc/gutenprint/html/tabs.css
@@ -94,7 +94,7 @@ DIV.tabs LI.current SPAN
    padding-bottom   : 6px;
 }
 
-DIV.nav
+DIV.navpath
 {
    background       : none;
    border           : none;
diff --git a/doc/gutenprint/html/unionstp__mxml__value__t.html b/doc/gutenprint/html/unionstp__mxml__value__t.html
deleted file mode 100644
index 17db531..0000000
--- a/doc/gutenprint/html/unionstp__mxml__value__t.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprint API Reference: stp_mxml_value_t Union Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stp_mxml_value_t Union Reference</h1><!-- doxytag: class="stp_mxml_value_t" --><code>#include &lt;mxml.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">element</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">integer</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">opaque</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">real</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">text</a></td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="96aab65fff9144bb7ac17e525769af31"></a><!-- doxytag: member="stp_mxml_value_t::element" ref="96aab65fff9144bb7ac17e525769af31" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__element__t.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__t.html#96aab65fff9144bb7ac17e525769af31">stp_mxml_value_t::element</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="14551523faecca83828853601e399aee"></a><!-- doxytag: member="stp_mxml_value_t::integer" ref="14551523faecca83828853601e399aee" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">int <a class="el" href="unionstp__mxml__value__t.html#14551523faecca83828853601e399aee">stp_mxml_value_t::integer</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="50776acb8e84f99d12434b8db2d77b2e"></a><!-- doxytag: member="stp_mxml_value_t::opaque" ref="50776acb8e84f99d12434b8db2d77b2e" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">char* <a class="el" href="unionstp__mxml__value__t.html#50776acb8e84f99d12434b8db2d77b2e">stp_mxml_value_t::opaque</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="0f60d52af338d4cbdd09b93879e89b1a"></a><!-- doxytag: member="stp_mxml_value_t::real" ref="0f60d52af338d4cbdd09b93879e89b1a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">double <a class="el" href="unionstp__mxml__value__t.html#0f60d52af338d4cbdd09b93879e89b1a">stp_mxml_value_t::real</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="3f462c7b6567252b1b2fe6eaf029e1cf"></a><!-- doxytag: member="stp_mxml_value_t::text" ref="3f462c7b6567252b1b2fe6eaf029e1cf" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__text__t.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__t.html#3f462c7b6567252b1b2fe6eaf029e1cf">stp_mxml_value_t::text</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this union was generated from the following file:<ul>
-<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
new file mode 100644
index 0000000..9e001ed
--- /dev/null
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprint API Reference: stp_mxml_value_u Union Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stp_mxml_value_u Union Reference</h1><!-- doxytag: class="stp_mxml_value_u" --><code>#include &lt;mxml.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">element</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">integer</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">opaque</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">real</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">text</a></td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="d4d8442bb433ac3da208e22ff0eaccf7"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="d4d8442bb433ac3da208e22ff0eaccf7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u::element</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="9540870864c06f2bf901024b7cc9048d"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="9540870864c06f2bf901024b7cc9048d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u::integer</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="ca8f6bf03f29248dee0b8d364454d051"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="ca8f6bf03f29248dee0b8d364454d051" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u::opaque</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="3f253397958ad919a1fc97c42a58bc67"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="3f253397958ad919a1fc97c42a58bc67" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u::real</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="82c76c9aca350baca3b72723d0a4e99d"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="82c76c9aca350baca3b72723d0a4e99d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u::text</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this union was generated from the following file:<ul>
+<li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index 44fe25c..037dbb8 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/util.h File Reference</h1><code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/util.h File Reference</h1>Utility functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -65,6 +70,8 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&nbsp;&nbsp;&nbsp;0x200000</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga447450ea502f96203aa2c47f6e49e92">STP_DBG_NO_COMPRESSION</a>&nbsp;&nbsp;&nbsp;0x400000</td></tr>
+
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
@@ -142,7 +149,9 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="group__util.html#g5ba7edc43ed094f32ae7d9158a362a7b"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Utility functions. <hr><h2>Define Documentation</h2>
+Utility functions. 
+<p>
+<hr><h2>Define Documentation</h2>
 <a class="anchor" name="9d373a9b65ff25b2db84c07394e1c212"></a><!-- doxytag: member="util.h::__attribute__" ref="9d373a9b65ff25b2db84c07394e1c212" args="(x)" -->
 <div class="memitem">
 <div class="memproto">
@@ -163,8 +172,9 @@ Utility functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index 38b16ce..77c6a39 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
-<h1>include/gutenprint/vars.h File Reference</h1><code>#include &lt;<a class="el" href="array_8h.html">gutenprint/array.h</a>&gt;</code><br>
+<div class="contents">
+<h1>include/gutenprint/vars.h File Reference</h1>Print job functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="array_8h.html">gutenprint/array.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -37,6 +42,8 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4f46af65b4df5881b980acba32a05b70">STP_CHANNEL_NONE</a>&nbsp;&nbsp;&nbsp;((unsigned char) -1)</td></tr>
+
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
 
@@ -54,8 +61,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> )(void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br>
@@ -362,33 +368,69 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g390f7c2fe642bea08507374a184de233">stp_clear_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a parameter.  <a href="group__vars.html#g390f7c2fe642bea08507374a184de233"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g110e543418842a6dd79149409620bf13">stp_list_string_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all string parameters.  <a href="group__vars.html#g110e543418842a6dd79149409620bf13"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g76c7e033078e6c2fa276ee72ca97c63c">stp_list_file_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all file parameters.  <a href="group__vars.html#g76c7e033078e6c2fa276ee72ca97c63c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdec4183ce240188ed18fdc21d9b518f7">stp_list_float_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all float parameters.  <a href="group__vars.html#gdec4183ce240188ed18fdc21d9b518f7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge08d29a439b77219f32d037ab5b191f5">stp_list_int_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all integer parameters.  <a href="group__vars.html#ge08d29a439b77219f32d037ab5b191f5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5cae4a118badc7c52e5f7b7543c83d8e">stp_list_dimension_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all dimension parameters.  <a href="group__vars.html#g5cae4a118badc7c52e5f7b7543c83d8e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g60f98e23144fd1bf5aa53def670b2c91">stp_list_boolean_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all boolean parameters.  <a href="group__vars.html#g60f98e23144fd1bf5aa53def670b2c91"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1329d614d6cd18fc6c244b020e26b081">stp_list_curve_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#g6ed828e872f7678a89e1b065d377112e"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all curve parameters.  <a href="group__vars.html#g1329d614d6cd18fc6c244b020e26b081"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g16d23d59368e907a29719f0902ea75fe">stp_list_array_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all array parameters.  <a href="group__vars.html#g16d23d59368e907a29719f0902ea75fe"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d06ccaf72d08800f7eb78b3293f4a00">stp_list_raw_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all raw parameters.  <a href="group__vars.html#g4d06ccaf72d08800f7eb78b3293f4a00"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g27864133bc2159d1472cbdfb3b781c27">stp_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#g7487203059e7ccd71c4673656b3042b1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List all parameters.  <a href="group__vars.html#g27864133bc2159d1472cbdfb3b781c27"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9f06e27ce5b6808d30c6fc01558db3b">stp_set_string_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#gc9f06e27ce5b6808d30c6fc01558db3b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0628a3f1feb7db7b5b10249a2b4f2412">stp_set_file_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#g0628a3f1feb7db7b5b10249a2b4f2412"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g49e5b05ba7bf8ccf6e95cb744f4f0f93">stp_set_float_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#g49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0cc1a26e8c3d502024c55a065fd5629a">stp_set_int_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#gb78f4273798c6e3e720afe01680cf752"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#g0cc1a26e8c3d502024c55a065fd5629a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g28feceb75f731d6de08d1fdad1fc269e">stp_set_dimension_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#g28feceb75f731d6de08d1fdad1fc269e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3b74af22c776ddebd6b70455e196fe1c">stp_set_boolean_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#g3b74af22c776ddebd6b70455e196fe1c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0486744f97114ba03d4f8f7562d6c739">stp_set_curve_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#g0486744f97114ba03d4f8f7562d6c739"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d13479ad3669ec9b8d7dcc109bc8e7d">stp_set_array_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#g4d13479ad3669ec9b8d7dcc109bc8e7d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g47b8c3b31693ecdef420160b40b23a0d">stp_set_raw_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#g47b8c3b31693ecdef420160b40b23a0d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5ececd1972a375e1e569ed4a242ed1ed">stp_set_parameter_active</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a parameter.  <a href="group__vars.html#g5ececd1972a375e1e569ed4a242ed1ed"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86"></a><br></td></tr>
@@ -416,6 +458,9 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#g285f05c648724c80bf05af30f87120a3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga416ba26ede5046db94b54b9d846e329">stp_check_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a parameter is set.  <a href="group__vars.html#ga416ba26ede5046db94b54b9d846e329"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d"></a><br></td></tr>
@@ -443,6 +488,9 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g31b32d5481a838276f23cfa4bc010c03">stp_get_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a parameter.  <a href="group__vars.html#g31b32d5481a838276f23cfa4bc010c03"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br></td></tr>
@@ -482,8 +530,11 @@ stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Print job functions. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+Print job functions. 
+<p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index bdb0475..f0b74da 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<h1>include/gutenprint/weave.h File Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprint/weave.h File Reference</h1>Softweave functions. <a href="#_details">More...</a>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td></tr>
@@ -89,7 +94,9 @@
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-Softweave functions. <hr><h2>Define Documentation</h2>
+Softweave functions. 
+<p>
+<hr><h2>Define Documentation</h2>
 <a class="anchor" name="6e5fd9b98567e1fd3fde622fd42dec67"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="6e5fd9b98567e1fd3fde622fd42dec67" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -650,8 +657,9 @@ Softweave functions. <hr><h2>Define Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index 3077302..d26c3cc 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -4,17 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="modules.html"><span>Modules</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
-  </ul>
-</div>
-<h1>include/gutenprint/xml.h File Reference</h1><code>#include &lt;<a class="el" href="mxml_8h.html">gutenprint/mxml.h</a>&gt;</code><br>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprint/xml.h File Reference</h1>XML tree functions. <a href="#_details">More...</a>
+<p>
+<code>#include &lt;<a class="el" href="mxml_8h.html">gutenprint/mxml.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
@@ -39,6 +44,14 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#955626cb67a5067d67a116f8ab67007d">stp_xmlstrtod</a> (const char *textval)</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#4a44cfc8ec6e821c4f8564397b3bd66f">stp_xmlstrtoraw</a> (const char *textval)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#3e003171cb008a542fffbeff3f2e2299">stp_rawtoxmlstr</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#6bdda178f51ef17e02b0c662e0b06a8b">stp_strtoxmlstr</a> (const char *raw)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#13a01102edf22955690bf21a44049369">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" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#1a82a8dc830a6f7f81ec4e6f2344a5af">stp_xml_init</a> (void)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#b7b7abdceb4f1e6e6c6a607cd2eedead">stp_xml_exit</a> (void)</td></tr>
@@ -59,13 +72,25 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ce5ac81af291e43504d5c0200276e543">stp_array_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *array)</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#2ec4cf1f87b354d564429f3d34afd029">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" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#e02d45dc8cae7bea5c4e378e121d6623">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#cecaf19b0eb498487f14bf462c181c16">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" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#c0c8478cc24d2aee3eaaf7eafa4586b9">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#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#152b1cd11fb8bc6b7ecc95c65ee74ec6">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#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#139bc6e17f2ccabf7e149241f923d9c4">stp_xmltree_create_from_vars</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#c3ebefda15f3996388895a4408c3b030">stp_xml_parse_file_named</a> (const char *name)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
-XML tree functions. <hr><h2>Typedef Documentation</h2>
+XML tree functions. 
+<p>
+<hr><h2>Typedef Documentation</h2>
 <a class="anchor" name="fad8ff906c4248935a93794f1b6f8c1a"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="fad8ff906c4248935a93794f1b6f8c1a" args=")(stp_mxml_node_t *node, const char *file)" -->
 <div class="memitem">
 <div class="memproto">
@@ -122,6 +147,55 @@ XML tree functions. <hr><h2>Typedef Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="13a01102edf22955690bf21a44049369"></a><!-- doxytag: member="xml.h::stp_prtraw" ref="13a01102edf22955690bf21a44049369" args="(const stp_raw_t *raw, FILE *fp)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_prtraw           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>raw</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>fp</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="3e003171cb008a542fffbeff3f2e2299"></a><!-- doxytag: member="xml.h::stp_rawtoxmlstr" ref="3e003171cb008a542fffbeff3f2e2299" args="(const stp_raw_t *raw)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* stp_rawtoxmlstr           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>raw</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="9082cdb0bef669a2c1cd463874d56cb3"></a><!-- doxytag: member="xml.h::stp_register_xml_parser" ref="9082cdb0bef669a2c1cd463874d56cb3" args="(const char *name, stp_xml_parse_func parse_func)" -->
 <div class="memitem">
 <div class="memproto">
@@ -191,6 +265,26 @@ XML tree functions. <hr><h2>Typedef Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="6bdda178f51ef17e02b0c662e0b06a8b"></a><!-- doxytag: member="xml.h::stp_strtoxmlstr" ref="6bdda178f51ef17e02b0c662e0b06a8b" args="(const char *raw)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* stp_strtoxmlstr           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>raw</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="018dc99b4a78447b2e8cf66fec5a47b8"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="018dc99b4a78447b2e8cf66fec5a47b8" args="(const char *name)" -->
 <div class="memitem">
 <div class="memproto">
@@ -231,6 +325,119 @@ XML tree functions. <hr><h2>Typedef Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="2ec4cf1f87b354d564429f3d34afd029"></a><!-- doxytag: member="xml.h::stp_vars_create_from_xmltree" ref="2ec4cf1f87b354d564429f3d34afd029" args="(stp_mxml_node_t *da)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_vars_create_from_xmltree           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>da</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="cecaf19b0eb498487f14bf462c181c16"></a><!-- doxytag: member="xml.h::stp_vars_create_from_xmltree_ref" ref="cecaf19b0eb498487f14bf462c181c16" args="(stp_mxml_node_t *da, stp_mxml_node_t *root)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_vars_create_from_xmltree_ref           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>da</em>, </td>
+        </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> *&nbsp;</td>
+          <td class="paramname"> <em>root</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="c0c8478cc24d2aee3eaaf7eafa4586b9"></a><!-- doxytag: member="xml.h::stp_vars_fill_from_xmltree" ref="c0c8478cc24d2aee3eaaf7eafa4586b9" args="(stp_mxml_node_t *da, stp_vars_t *v)" -->
+<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> *&nbsp;</td>
+          <td class="paramname"> <em>da</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="152b1cd11fb8bc6b7ecc95c65ee74ec6"></a><!-- doxytag: member="xml.h::stp_vars_fill_from_xmltree_ref" ref="152b1cd11fb8bc6b7ecc95c65ee74ec6" args="(stp_mxml_node_t *da, stp_mxml_node_t *root, stp_vars_t *v)" -->
+<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> *&nbsp;</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> *&nbsp;</td>
+          <td class="paramname"> <em>root</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="b7b7abdceb4f1e6e6c6a607cd2eedead"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="b7b7abdceb4f1e6e6c6a607cd2eedead" args="(void)" -->
 <div class="memitem">
 <div class="memproto">
@@ -440,6 +647,26 @@ XML tree functions. <hr><h2>Typedef Documentation</h2>
 
 </div>
 </div><p>
+<a class="anchor" name="4a44cfc8ec6e821c4f8564397b3bd66f"></a><!-- doxytag: member="xml.h::stp_xmlstrtoraw" ref="4a44cfc8ec6e821c4f8564397b3bd66f" args="(const char *textval)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="structstp__raw__t.html">stp_raw_t</a>* stp_xmlstrtoraw           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>textval</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <a class="anchor" name="1c1ba2f2312544bda8b3ce2e919e4687"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="1c1ba2f2312544bda8b3ce2e919e4687" args="(const char *value)" -->
 <div class="memitem">
 <div class="memproto">
@@ -520,8 +747,29 @@ XML tree functions. <hr><h2>Typedef Documentation</h2>
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by&nbsp;
+<a class="anchor" name="139bc6e17f2ccabf7e149241f923d9c4"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_vars" ref="139bc6e17f2ccabf7e149241f923d9c4" args="(const stp_vars_t *v)" -->
+<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>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2.dox.in b/doc/gutenprintui2.dox.in
index 5761bef..2264f55 100644
--- a/doc/gutenprintui2.dox.in
+++ b/doc/gutenprintui2.dox.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.3.4
+# Doxyfile 1.5.3
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,10 +14,18 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "libgutenprintui2 API Reference"
+PROJECT_NAME           = "libgutenprintui2 API Reference "
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -32,27 +40,27 @@ PROJECT_NUMBER         = @VERSION@
 
 OUTPUT_DIRECTORY       = ./gutenprintui2
 
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -67,16 +75,28 @@ BRIEF_MEMBER_DESC      = YES
 
 REPEAT_BRIEF           = YES
 
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
@@ -89,10 +109,21 @@ FULL_PATH_NAMES        = YES
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list.
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
 
 STRIP_FROM_PATH        = ../
 
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
 # doesn't support long names like on DOS, Mac, or CD-ROM.
@@ -102,11 +133,19 @@ SHORT_NAMES            = NO
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explict @brief command for a brief description.
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
 # treat a multi-line C++ special comment block (i.e. a block of //! or /// 
 # comments) as a brief description. This used to be the default behaviour. 
@@ -124,16 +163,15 @@ DETAILS_AT_TOP         = NO
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
-# reimplements.
+# re-implements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
 
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -149,20 +187,41 @@ TAB_SIZE               = 8
 
 ALIASES                = 
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
 # For instance, namespaces will be presented as packages, qualified scopes 
 # will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
 # the same type (for instance a group of public functions) to be put as a 
 # subgroup of that type (e.g. under the Public Functions section). Set it to 
@@ -198,6 +257,20 @@ EXTRACT_STATIC         = YES
 
 EXTRACT_LOCAL_CLASSES  = YES
 
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be extracted 
+# and appear in the documentation as a namespace called 'anonymous_namespace{file}', 
+# where file will be replaced with the base name of the file that contains the anonymous 
+# namespace. By default anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
 # If set to NO (the default) these members will be included in the 
@@ -238,7 +311,7 @@ INTERNAL_DOCS          = NO
 # file names in lower-case letters. If set to YES upper-case letters are also 
 # allowed. This is useful if you have classes or files whose names only differ 
 # in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
@@ -266,6 +339,23 @@ INLINE_INFO            = YES
 
 SORT_MEMBER_DOCS       = YES
 
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.
@@ -311,6 +401,22 @@ MAX_INITIALIZER_LINES  = 30
 
 SHOW_USED_FILES        = YES
 
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -339,12 +445,22 @@ WARN_IF_UNDOCUMENTED   = YES
 
 WARN_IF_DOC_ERROR      = YES
 
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
 
-WARN_FORMAT            = "$file:$line: $text"
+WARN_FORMAT            = "$file:$line: $text "
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning 
 # and error messages should be written. If left blank the output is written 
@@ -363,12 +479,19 @@ WARN_LOGFILE           =
 
 INPUT                  = @top_srcdir@/include/gutenprintui2
 
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
 FILE_PATTERNS          = 
 
@@ -384,17 +507,27 @@ RECURSIVE              = NO
 
 EXCLUDE                = @top_srcdir@/src/main/xmli18n-tmp.h
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = 
 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
 # the \include command).
@@ -426,10 +559,20 @@ IMAGE_PATH             =
 # by executing (via popen()) the command <filter> <input-file>, where <filter> 
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
 # input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
 
 INPUT_FILTER           = 
 
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
 # INPUT_FILTER) will be used to filter the input files when producing source 
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
@@ -441,7 +584,11 @@ FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources.
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH 
+# then you must also enable this option. If you don't then doxygen will produce 
+# a warning and turn it on anyway
 
 SOURCE_BROWSER         = NO
 
@@ -468,6 +615,21 @@ REFERENCED_BY_RELATION = YES
 
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
@@ -533,7 +695,9 @@ HTML_FOOTER            =
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = 
 
@@ -550,10 +714,18 @@ HTML_ALIGN_MEMBERS     = YES
 
 GENERATE_HTMLHELP      = NO
 
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
-# written to the html output dir.
+# written to the html output directory.
 
 CHM_FILE               = 
 
@@ -688,7 +860,7 @@ LATEX_HIDE_INDICES     = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimised for Word 97 and may not look very pretty with 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
@@ -715,7 +887,7 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 
 # Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assigments. You only have to provide 
+# config file, i.e. a series of assignments. You only have to provide 
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    = 
@@ -759,9 +931,7 @@ MAN_LINKS              = NO
 
 # If the GENERATE_XML tag is set to YES Doxygen will 
 # generate an XML file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# the code including all documentation.
 
 GENERATE_XML           = NO
 
@@ -783,6 +953,13 @@ XML_SCHEMA             =
 
 XML_DTD                = 
 
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -847,7 +1024,7 @@ MACRO_EXPANSION        = NO
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
@@ -873,7 +1050,9 @@ INCLUDE_FILE_PATTERNS  =
 # are defined before the preprocessor is started (similar to the -D option of 
 # gcc). The argument of the tag is a list of macros of the form: name 
 # or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
 
 PREDEFINED             = 
 
@@ -887,13 +1066,13 @@ EXPAND_AS_DEFINED      =
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
 # on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. 
@@ -940,13 +1119,22 @@ PERL_PATH              = @PERL@
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
 
 CLASS_DIAGRAMS         = NO
 
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented 
 # or is not a class.
@@ -974,8 +1162,13 @@ CLASS_GRAPH            = NO
 
 COLLABORATION_GRAPH    = NO
 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similiar to the OMG's Unified Modeling 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
 # Language.
 
 UML_LOOK               = NO
@@ -999,7 +1192,7 @@ INCLUDE_GRAPH          = NO
 
 INCLUDED_BY_GRAPH      = NO
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
 # generate a call dependency graph for every global function or class method. 
 # Note that enabling this option will significantly increase the time of a run. 
 # So in most cases it will be better to enable call graphs for selected 
@@ -1007,11 +1200,26 @@ INCLUDED_BY_GRAPH      = NO
 
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = NO
 
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
@@ -1019,7 +1227,7 @@ GRAPHICAL_HIERARCHY    = NO
 DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = 
 
@@ -1029,33 +1237,41 @@ DOT_PATH               =
 
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the number 
+# of direct children of the root node in a graph is already larger than 
+# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
 # graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
 # arrows in the dot generated graphs.
@@ -1069,7 +1285,7 @@ GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
+# Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index b8ab324..6919c28 100644
--- a/doc/gutenprintui2/gutenprintui2.tag
+++ b/doc/gutenprintui2/gutenprintui2.tag
@@ -64,21 +64,25 @@
     </member>
     <member kind="enumeration">
       <name>StpuiCurveType</name>
+      <anchorfile>curve_8h.html</anchorfile>
       <anchor>59cb8817385039367325d6dbb4a0996b</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_LINEAR</name>
+      <anchorfile>curve_8h.html</anchorfile>
       <anchor>59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_SPLINE</name>
+      <anchorfile>curve_8h.html</anchorfile>
       <anchor>59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_FREE</name>
+      <anchorfile>curve_8h.html</anchorfile>
       <anchor>59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89</anchor>
       <arglist></arglist>
     </member>
@@ -224,7 +228,14 @@
     <includes id="gammacurve_8h" name="gammacurve.h" local="no" imported="no">gutenprintui2/gammacurve.h</includes>
     <includes id="typebuiltins_8h" name="typebuiltins.h" local="no" imported="no">gutenprintui2/typebuiltins.h</includes>
     <class kind="struct">stpui_plist_t</class>
-    <class kind="struct">stpui_image_t</class>
+    <class kind="struct">stpui_image</class>
+    <member kind="typedef">
+      <type>struct stpui_image</type>
+      <name>stpui_image_t</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
+      <anchor>195aac96c77c6de3925cd3d13c6ce2f1</anchor>
+      <arglist></arglist>
+    </member>
     <member kind="typedef">
       <type>guchar *(*</type>
       <name>get_thumbnail_func_t</name>
@@ -234,51 +245,61 @@
     </member>
     <member kind="enumeration">
       <name>orient_t</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>c33232f845969eb04b32e1006c8240a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_AUTO</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_PORTRAIT</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_LANDSCAPE</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_UPSIDEDOWN</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_SEASCAPE</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>command_t</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>b31350eb38b009cbd282027630a1ee10</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_DEFAULT</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_CUSTOM</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_FILE</name>
+      <anchorfile>gutenprintui_8h.html</anchorfile>
       <anchor>b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f</anchor>
       <arglist></arglist>
     </member>
@@ -942,62 +963,62 @@
     </member>
   </compound>
   <compound kind="struct">
-    <name>stpui_image_t</name>
-    <filename>structstpui__image__t.html</filename>
+    <name>stpui_image</name>
+    <filename>structstpui__image.html</filename>
     <member kind="variable">
       <type>stp_image_t</type>
       <name>im</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>38f170e2acf7842eb511adf52a1b9de9</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>00862540482f307175e9fbf252751320</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>transpose</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>c6914425cfe9376043dc64b9ade33b40</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>5f2a75c7187c6abcf20e15e2aad22549</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>hflip</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>0b96d404e3e44afd8272c3534a465740</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>f2733a318654d50214c94fccd9a018b7</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>vflip</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>167d1341e9223f16afcc3ce4d52c6e72</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>c378339fe87fa21d5f117fc11b3f5b6c</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_ccw</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>de9e076c2a520fe59fbbad51453c05a7</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>0a31280def8cd739184192dbe8d34fa8</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_cw</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>fb7c04bd61d67e06429fcc88e088774e</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>e111082f0f23096d89e024c4fde9c0d6</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_180</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>215928f81c63d90d2ede73606cf95fd8</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>aaae08fdabffb3d31ac761dfe0624506</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>crop</name>
-      <anchorfile>structstpui__image__t.html</anchorfile>
-      <anchor>77fc83d55bb4367e9698244528cbcbe9</anchor>
+      <anchorfile>structstpui__image.html</anchorfile>
+      <anchor>96e6cc155230793c8aa847e5a7cd7255</anchor>
       <arglist>)(struct stpui_image *image, int left, int top, int right, int bottom)</arglist>
     </member>
   </compound>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index e8f3737..1112fa9 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -4,31 +4,35 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>libgutenprintui2 API Reference Data Structures</h1>Here are the data structures with brief descriptions:<table>
+<div class="contents">
+<h1>Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td><td class="indexvalue"></td></tr>
   <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__t.html">stpui_image_t</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>
 </table>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 1800e7b..2f24065 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -4,28 +4,32 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>libgutenprintui2 API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
+<div class="contents">
+<h1>Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
 <tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstpui__image__t.html">stpui_image_t</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index a698160..dc4146a 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -4,14 +4,17 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>include/gutenprintui2/curve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
 <code>#include &lt;gtk/gtkdrawingarea.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -35,11 +38,9 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#41b32938b1bfc087ca93b3655ef03ab6">STPUI_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-<a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-<a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> { <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1">STPUI_CURVE_TYPE_LINEAR</a>, 
@@ -474,8 +475,9 @@
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css
index c7db1a8..74c22a2 100644
--- a/doc/gutenprintui2/html/doxygen.css
+++ b/doc/gutenprintui2/html/doxygen.css
@@ -2,19 +2,21 @@ BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
 	font-family: Geneva, Arial, Helvetica, sans-serif;
 }
 BODY,TD {
-       font-size: 90%;
+	font-size: 90%;
 }
 H1 {
 	text-align: center;
-       font-size: 160%;
+	font-size: 160%;
 }
 H2 {
-       font-size: 120%;
+	font-size: 120%;
 }
 H3 {
-       font-size: 100%;
+	font-size: 100%;
+}
+CAPTION { 
+	font-weight: bold 
 }
-CAPTION { font-weight: bold }
 DIV.qindex {
 	width: 100%;
 	background-color: #e8eef2;
@@ -24,7 +26,7 @@ DIV.qindex {
 	padding: 2px;
 	line-height: 140%;
 }
-DIV.nav {
+DIV.navpath {
 	width: 100%;
 	background-color: #e8eef2;
 	border: 1px solid #84b0c7;
@@ -70,15 +72,43 @@ A.qindexHL:hover {
 	background-color: #6666cc;
 	color: #ffffff;
 }
-A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
-A.el { text-decoration: none; font-weight: bold }
-A.elRef { font-weight: bold }
-A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}
-A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}
-A.codeRef:link { font-weight: normal; color: #0000FF}
-A.codeRef:visited { font-weight: normal; color: #0000FF}
-A:hover { text-decoration: none; background-color: #f2f2ff }
-DL.el { margin-left: -1cm }
+A.qindexHL:visited { 
+	text-decoration: none; 
+	background-color: #6666cc; 
+	color: #ffffff 
+}
+A.el { 
+	text-decoration: none; 
+	font-weight: bold 
+}
+A.elRef { 
+	font-weight: bold 
+}
+A.code:link { 
+	text-decoration: none; 
+	font-weight: normal; 
+	color: #0000FF
+}
+A.code:visited { 
+	text-decoration: none; 
+	font-weight: normal; 
+	color: #0000FF
+}
+A.codeRef:link { 
+	font-weight: normal; 
+	color: #0000FF
+}
+A.codeRef:visited { 
+	font-weight: normal; 
+	color: #0000FF
+}
+A:hover { 
+	text-decoration: none; 	
+	background-color: #f2f2ff 
+}
+DL.el { 
+	margin-left: -1cm 
+}
 .fragment {
        font-family: monospace, fixed;
        font-size: 95%;
@@ -95,7 +125,13 @@ PRE.fragment {
 	padding-top: 4px;
 	padding-bottom: 4px;
 }
-DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
+DIV.ah { 
+	background-color: black; 
+	font-weight: bold; 
+	color: #ffffff; 
+	margin-bottom: 3px; 
+	margin-top: 3px 
+}
 
 DIV.groupHeader {
        margin-left: 16px;
@@ -103,7 +139,11 @@ DIV.groupHeader {
        margin-bottom: 6px;
        font-weight: bold;
 }
-DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% }
+DIV.groupText { 
+	margin-left: 16px; 
+	font-style: italic; 
+	font-size: 90% 
+}
 BODY {
 	background: white;
 	color: black;
@@ -137,11 +177,16 @@ TD.indexvalue {
 	border: 1px solid #CCCCCC;
 }
 TR.memlist {
-   background-color: #f0f0f0; 
+	background-color: #f0f0f0; 
+}
+P.formulaDsp { 
+	text-align: center; 
+}
+IMG.formulaDsp {
+}
+IMG.formulaInl { 
+	vertical-align: middle; 
 }
-P.formulaDsp { text-align: center; }
-IMG.formulaDsp { }
-IMG.formulaInl { vertical-align: middle; }
 SPAN.keyword       { color: #008000 }
 SPAN.keywordtype   { color: #604020 }
 SPAN.keywordflow   { color: #e08000 }
@@ -149,8 +194,13 @@ SPAN.comment       { color: #800000 }
 SPAN.preprocessor  { color: #806020 }
 SPAN.stringliteral { color: #002080 }
 SPAN.charliteral   { color: #008080 }
+SPAN.vhdldigit     { color: #ff00ff }
+SPAN.vhdlchar      { color: #000000 }
+SPAN.vhdlkeyword   { color: #700070 }
+SPAN.vhdllogic     { color: #ff0000 }
+
 .mdescLeft {
-       padding: 0px 8px 4px 8px;
+	padding: 0px 8px 4px 8px;
 	font-size: 80%;
 	font-style: italic;
 	background-color: #FAFAFA;
@@ -161,7 +211,7 @@ SPAN.charliteral   { color: #008080 }
 	margin: 0px;
 }
 .mdescRight {
-       padding: 0px 8px 4px 8px;
+        padding: 0px 8px 4px 8px;
 	font-size: 80%;
 	font-style: italic;
 	background-color: #FAFAFA;
@@ -258,23 +308,26 @@ SPAN.charliteral   { color: #008080 }
 	border-right-style: none;
 	border-bottom-style: none;
 	border-left-style: none;
-       color: #606060;
+	color: #606060;
 	background-color: #FAFAFA;
 	font-size: 80%;
 }
-.search     { color: #003399;
-              font-weight: bold;
+.search { 
+	color: #003399;
+	font-weight: bold;
 }
 FORM.search {
-              margin-bottom: 0px;
-              margin-top: 0px;
+	margin-bottom: 0px;
+	margin-top: 0px;
 }
-INPUT.search { font-size: 75%;
-               color: #000080;
-               font-weight: normal;
-               background-color: #e8eef2;
+INPUT.search { 
+	font-size: 75%;
+	color: #000080;
+	font-weight: normal;
+	background-color: #e8eef2;
 }
-TD.tiny      { font-size: 75%;
+TD.tiny { 
+	font-size: 75%;
 }
 a {
 	color: #1A41A8;
@@ -282,66 +335,70 @@ a {
 a:visited {
 	color: #2A3798;
 }
-.dirtab { padding: 4px;
-          border-collapse: collapse;
-          border: 1px solid #84b0c7;
+.dirtab { 
+	padding: 4px;
+	border-collapse: collapse;
+	border: 1px solid #84b0c7;
 }
-TH.dirtab { background: #e8eef2;
-            font-weight: bold;
+TH.dirtab { 
+	background: #e8eef2;
+	font-weight: bold;
 }
-HR { height: 1px;
-     border: none;
-     border-top: 1px solid black;
+HR { 
+	height: 1px;
+	border: none;
+	border-top: 1px solid black;
 }
 
 /* Style for detailed member documentation */
 .memtemplate {
-  font-size: 80%;
-  color: #606060;
-  font-weight: normal;
+	font-size: 80%;
+	color: #606060;
+	font-weight: normal;
+	margin-left: 3px;
 } 
 .memnav { 
-  background-color: #e8eef2;
-  border: 1px solid #84b0c7;
-  text-align: center;
-  margin: 2px;
-  margin-right: 15px;
-  padding: 2px;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
+	text-align: center;
+	margin: 2px;
+	margin-right: 15px;
+	padding: 2px;
 }
 .memitem {
-  padding: 4px;
-  background-color: #eef3f5;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #dedeee;
-  -moz-border-radius: 8px 8px 8px 8px;
+	padding: 4px;
+	background-color: #eef3f5;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #dedeee;
+	-moz-border-radius: 8px 8px 8px 8px;
 }
 .memname {
-  white-space: nowrap;
-  font-weight: bold;
+	white-space: nowrap;
+	font-weight: bold;
 }
 .memdoc{
-  padding-left: 10px;
+	padding-left: 10px;
 }
 .memproto {
-  background-color: #d5e1e8;
-  width: 100%;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #84b0c7;
-  font-weight: bold;
-  -moz-border-radius: 8px 8px 8px 8px;
+	background-color: #d5e1e8;
+	width: 100%;
+	border-width: 1px;
+	border-style: solid;
+	border-color: #84b0c7;
+	font-weight: bold;
+	-moz-border-radius: 8px 8px 8px 8px;
 }
 .paramkey {
-  text-align: right;
+	text-align: right;
 }
 .paramtype {
-  white-space: nowrap;
+	white-space: nowrap;
 }
 .paramname {
-  color: #602020;
-  font-style: italic;
-  white-space: nowrap;
+	color: #602020;
+	font-style: italic;
+	white-space: nowrap;
 }
 /* End Styling for detailed member documentation */
 
@@ -350,9 +407,27 @@ HR { height: 1px;
 	font-family: sans-serif;
 	margin:0.5em;
 }
-.directory { font-size: 9pt; font-weight: bold; }
-.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
-.directory > h3 { margin-top: 0; }
-.directory p { margin: 0px; white-space: nowrap; }
-.directory div { display: none; margin: 0px; }
-.directory img { vertical-align: -30%; }
+.directory { 
+	font-size: 9pt; 
+	font-weight: bold; 
+}
+.directory h3 { 
+	margin: 0px; 
+	margin-top: 1em; 
+	font-size: 11pt; 
+}
+.directory > h3 { 
+	margin-top: 0; 
+}
+.directory p { 
+	margin: 0px; 
+	white-space: nowrap; 
+}
+.directory div { 
+	display: none; 
+	margin: 0px; 
+}
+.directory img { 
+	vertical-align: -30%; 
+}
+
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index 56ad89a..99507b7 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -4,28 +4,32 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
 </div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<h1>libgutenprintui2 API Reference File List</h1>Here is a list of all files with brief descriptions:<table>
+<div class="contents">
+<h1>File List</h1>Here is a list of all files with brief descriptions:<table>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index 978d121..75b9c8c 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -4,52 +4,55 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="functions.html"><span>All</span></a></li>
-    <li><a href="functions_vars.html"><span>Variables</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index__"><span>_</span></a></li>
-    <li><a href="#index_a"><span>a</span></a></li>
-    <li><a href="#index_b"><span>b</span></a></li>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_e"><span>e</span></a></li>
-    <li><a href="#index_g"><span>g</span></a></li>
-    <li><a href="#index_h"><span>h</span></a></li>
-    <li><a href="#index_i"><span>i</span></a></li>
-    <li><a href="#index_l"><span>l</span></a></li>
-    <li><a href="#index_m"><span>m</span></a></li>
-    <li><a href="#index_n"><span>n</span></a></li>
-    <li><a href="#index_o"><span>o</span></a></li>
-    <li><a href="#index_p"><span>p</span></a></li>
-    <li><a href="#index_q"><span>q</span></a></li>
-    <li><a href="#index_r"><span>r</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-    <li><a href="#index_t"><span>t</span></a></li>
-    <li><a href="#index_u"><span>u</span></a></li>
-    <li><a href="#index_v"><span>v</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="functions.html"><span>All</span></a></li>
+      <li><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index__"><span>_</span></a></li>
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_b"><span>b</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_h"><span>h</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_q"><span>q</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+      <li><a href="#index_v"><span>v</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
@@ -78,7 +81,7 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>command_type
 : <a class="el" href="structstpui__plist__t.html#c1243181065442af4c72c24c0d3901f3">stpui_plist_t</a>
 <li>crop
-: <a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">stpui_image</a>
 <li>ctlpoint
 : <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve</a>
 <li>current_standard_command
@@ -114,11 +117,11 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>height
 : <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve</a>
 <li>hflip
-: <a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image</a>
 <li>invalid_mask
 : <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t</a>
 </ul>
@@ -165,11 +168,11 @@ Here is a list of all struct and union fields with links to the structures/union
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image</a>
 <li>rotate_ccw
-: <a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image</a>
 <li>rotate_cw
-: <a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image</a>
 </ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
@@ -179,7 +182,7 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>table
 : <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve</a>
 <li>transpose
-: <a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image</a>
 </ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
@@ -191,10 +194,11 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>vbox
 : <a class="el" href="struct__StpuiGammaCurve.html#07e6d5e4479cbca4a927635cc6d02f26">_StpuiGammaCurve</a>
 <li>vflip
-: <a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 718aa35..1cb47c0 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -4,52 +4,55 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="functions.html"><span>All</span></a></li>
-    <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index__"><span>_</span></a></li>
-    <li><a href="#index_a"><span>a</span></a></li>
-    <li><a href="#index_b"><span>b</span></a></li>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_e"><span>e</span></a></li>
-    <li><a href="#index_g"><span>g</span></a></li>
-    <li><a href="#index_h"><span>h</span></a></li>
-    <li><a href="#index_i"><span>i</span></a></li>
-    <li><a href="#index_l"><span>l</span></a></li>
-    <li><a href="#index_m"><span>m</span></a></li>
-    <li><a href="#index_n"><span>n</span></a></li>
-    <li><a href="#index_o"><span>o</span></a></li>
-    <li><a href="#index_p"><span>p</span></a></li>
-    <li><a href="#index_q"><span>q</span></a></li>
-    <li><a href="#index_r"><span>r</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-    <li><a href="#index_t"><span>t</span></a></li>
-    <li><a href="#index_u"><span>u</span></a></li>
-    <li><a href="#index_v"><span>v</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="functions.html"><span>All</span></a></li>
+      <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index__"><span>_</span></a></li>
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_b"><span>b</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_h"><span>h</span></a></li>
+      <li><a href="#index_i"><span>i</span></a></li>
+      <li><a href="#index_l"><span>l</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_n"><span>n</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_q"><span>q</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_t"><span>t</span></a></li>
+      <li><a href="#index_u"><span>u</span></a></li>
+      <li><a href="#index_v"><span>v</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
@@ -78,7 +81,7 @@
 <li>command_type
 : <a class="el" href="structstpui__plist__t.html#c1243181065442af4c72c24c0d3901f3">stpui_plist_t</a>
 <li>crop
-: <a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">stpui_image</a>
 <li>ctlpoint
 : <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve</a>
 <li>current_standard_command
@@ -114,11 +117,11 @@
 <li>height
 : <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve</a>
 <li>hflip
-: <a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image</a>
 </ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image</a>
 <li>invalid_mask
 : <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t</a>
 </ul>
@@ -165,11 +168,11 @@
 </ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image</a>
 <li>rotate_ccw
-: <a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image</a>
 <li>rotate_cw
-: <a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image</a>
 </ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
@@ -179,7 +182,7 @@
 <li>table
 : <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve</a>
 <li>transpose
-: <a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image</a>
 </ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
@@ -191,10 +194,11 @@
 <li>vbox
 : <a class="el" href="struct__StpuiGammaCurve.html#07e6d5e4479cbca4a927635cc6d02f26">_StpuiGammaCurve</a>
 <li>vflip
-: <a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">stpui_image_t</a>
+: <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index f7049a2..763f525 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -4,14 +4,17 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>include/gutenprintui2/gammacurve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
 <code>#include &lt;gtk/gtkvbox.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -35,8 +38,7 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#e0813a802c9f9ee0a8fa4d3ff372ef0f">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
-<a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <br>
 <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a></td></tr>
@@ -235,8 +237,9 @@
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index 94ecad6..8e61493 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -4,40 +4,43 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_g"><span>g</span></a></li>
-    <li><a href="#index_o"><span>o</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
@@ -137,6 +140,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="gutenprintui_8h.html#ee04dfc45b26093bd65d3025b817cfd5">gutenprintui.h</a>
 <li>stpui_get_thumbnail_func()
 : <a class="el" href="gutenprintui_8h.html#74c1f441bf3fbb2198cf4cbaca8c23ef">gutenprintui.h</a>
+<li>stpui_image_t
+: <a class="el" href="gutenprintui_8h.html#195aac96c77c6de3925cd3d13c6ce2f1">gutenprintui.h</a>
 <li>STPUI_IS_CURVE
 : <a class="el" href="curve_8h.html#92f2038dd52d2b3af7c03bdeb5918567">curve.h</a>
 <li>STPUI_IS_CURVE_CLASS
@@ -246,8 +251,9 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>StpuiGammaCurveClass
 : <a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index 1220351..30121fb 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -4,30 +4,33 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 &nbsp;
 <p>
 <ul>
@@ -62,8 +65,9 @@
 <li>STPUI_TYPE_ORIENT_T
 : <a class="el" href="typebuiltins_8h.html#7c68a632b60b65d497e2933fa1b78a77">typebuiltins.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 08b83db..cdc3fca 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -4,30 +4,33 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 &nbsp;
 <p>
 <ul>
@@ -38,8 +41,9 @@
 <li>StpuiCurveType
 : <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">curve.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 2b9f667..f7bef37 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -4,30 +4,33 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 &nbsp;
 <p>
 <ul>
@@ -54,8 +57,9 @@
 <li>STPUI_CURVE_TYPE_SPLINE
 : <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1">curve.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index a8fcf62..b0f79b4 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -4,39 +4,42 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
-    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="#index_c"><span>c</span></a></li>
-    <li><a href="#index_o"><span>o</span></a></li>
-    <li><a href="#index_s"><span>s</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
+      <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_o"><span>o</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+    </ul>
+  </div>
 
 <p>
+</div>
+<div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
@@ -175,8 +178,9 @@
 <li>stpui_set_thumbnail_func()
 : <a class="el" href="gutenprintui_8h.html#fcaf0ce6ff01c073cdfb2d2f80ede234">gutenprintui.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 752d98a..0cc96a0 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -4,35 +4,40 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
-    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="globals.html"><span>All</span></a></li>
-    <li><a href="globals_func.html"><span>Functions</span></a></li>
-    <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
-    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
-    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-    <li><a href="globals_defs.html"><span>Defines</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+      <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="globals.html"><span>All</span></a></li>
+      <li><a href="globals_func.html"><span>Functions</span></a></li>
+      <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+      <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+      <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 &nbsp;
 <p>
 <ul>
 <li>get_thumbnail_func_t
 : <a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">gutenprintui.h</a>
+<li>stpui_image_t
+: <a class="el" href="gutenprintui_8h.html#195aac96c77c6de3925cd3d13c6ce2f1">gutenprintui.h</a>
 <li>StpuiCurve
 : <a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">curve.h</a>
 <li>StpuiCurveClass
@@ -42,8 +47,9 @@
 <li>StpuiGammaCurveClass
 : <a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
 </ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index 3467383..308349c 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -4,14 +4,17 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>include/gutenprintui2/gutenprintui.h File Reference</h1><code>#include &lt;gtk/gtk.h&gt;</code><br>
 <code>#include &lt;gutenprint/gutenprint.h&gt;</code><br>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprintui2/curve.h</a>&gt;</code><br>
@@ -22,9 +25,11 @@
 <tr><td colspan="2"><br><h2>Data Structures</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html">stpui_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html">stpui_image</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a></td></tr>
+
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef guchar *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a> )(void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
@@ -146,7 +151,7 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ee04dfc45b26093bd65d3025b817cfd5">stpui_get_thumbnail_data</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#1ffdddfb6efd3353d403192b2b2c1e20">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image__t.html">stpui_image_t</a> *im)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#1ffdddfb6efd3353d403192b2b2c1e20">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image.html">stpui_image_t</a> *im)</td></tr>
 
 </table>
 <hr><h2>Typedef Documentation</h2>
@@ -165,6 +170,21 @@
 
 </div>
 </div><p>
+<a class="anchor" name="195aac96c77c6de3925cd3d13c6ce2f1"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="195aac96c77c6de3925cd3d13c6ce2f1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>  <a class="el" href="structstpui__image.html">stpui_image_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
 <a class="anchor" name="b31350eb38b009cbd282027630a1ee10"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="b31350eb38b009cbd282027630a1ee10" args="" -->
 <div class="memitem">
@@ -1143,7 +1163,7 @@
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstpui__image__t.html">stpui_image_t</a> *&nbsp;</td>
+          <td class="paramtype"><a class="el" href="structstpui__image.html">stpui_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>im</em></td><td>&nbsp;</td>
         </tr>
         <tr>
@@ -1486,8 +1506,9 @@
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index 9597dff..d725e50 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -4,18 +4,22 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<h3 align="center">5.1.98.2 </h3><hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+<h3 align="center">5.2.1 </h3></div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index c239ece..086db60 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -4,21 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>_StpuiCurve Struct Reference</h1><!-- doxytag: class="_StpuiCurve" --><code>#include &lt;curve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -283,8 +286,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 2a4677c..ced0db0 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -4,21 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>_StpuiCurveClass Struct Reference</h1><!-- doxytag: class="_StpuiCurveClass" --><code>#include &lt;curve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -130,8 +133,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index 4b2e73e..533348f 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -4,21 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
 <h1>_StpuiGammaCurve Struct Reference</h1><!-- doxytag: class="_StpuiGammaCurve" --><code>#include &lt;gammacurve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -147,8 +150,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index 9f53ba9..cba598e 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -4,21 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>_StpuiGammaCurveClass Struct Reference</h1><!-- doxytag: class="_StpuiGammaCurveClass" --><code>#include &lt;gammacurve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -113,8 +116,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
new file mode 100644
index 0000000..2f40c97
--- /dev/null
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -0,0 +1,175 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprintui2 API Reference: stpui_image Struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>stpui_image Struct Reference</h1><!-- doxytag: class="stpui_image" --><code>#include &lt;gutenprintui.h&gt;</code>
+<p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">im</a></td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
+
+</table>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="00862540482f307175e9fbf252751320"></a><!-- doxytag: member="stpui_image::im" ref="00862540482f307175e9fbf252751320" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">stp_image_t <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image::im</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="5f2a75c7187c6abcf20e15e2aad22549"></a><!-- doxytag: member="stpui_image::transpose" ref="5f2a75c7187c6abcf20e15e2aad22549" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f2733a318654d50214c94fccd9a018b7"></a><!-- doxytag: member="stpui_image::hflip" ref="f2733a318654d50214c94fccd9a018b7" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="c378339fe87fa21d5f117fc11b3f5b6c"></a><!-- doxytag: member="stpui_image::vflip" ref="c378339fe87fa21d5f117fc11b3f5b6c" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="0a31280def8cd739184192dbe8d34fa8"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="0a31280def8cd739184192dbe8d34fa8" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="e111082f0f23096d89e024c4fde9c0d6"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="e111082f0f23096d89e024c4fde9c0d6" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="aaae08fdabffb3d31ac761dfe0624506"></a><!-- doxytag: member="stpui_image::rotate_180" ref="aaae08fdabffb3d31ac761dfe0624506" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="96e6cc155230793c8aa847e5a7cd7255"></a><!-- doxytag: member="stpui_image::crop" ref="96e6cc155230793c8aa847e5a7cd7255" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">stpui_image::crop</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprintui2/html/structstpui__image__t.html b/doc/gutenprintui2/html/structstpui__image__t.html
deleted file mode 100644
index d2b1878..0000000
--- a/doc/gutenprintui2/html/structstpui__image__t.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>libgutenprintui2 API Reference: stpui_image_t Struct Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
-</div>
-<h1>stpui_image_t Struct Reference</h1><!-- doxytag: class="stpui_image_t" --><code>#include &lt;gutenprintui.h&gt;</code>
-<p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">im</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">transpose</a> )(struct stpui_image *image)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">hflip</a> )(struct stpui_image *image)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">vflip</a> )(struct stpui_image *image)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">rotate_ccw</a> )(struct stpui_image *image)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">rotate_cw</a> )(struct stpui_image *image)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">rotate_180</a> )(struct stpui_image *image)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">crop</a> )(struct stpui_image *image, int left, int top, int right, int bottom)</td></tr>
-
-</table>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="38f170e2acf7842eb511adf52a1b9de9"></a><!-- doxytag: member="stpui_image_t::im" ref="38f170e2acf7842eb511adf52a1b9de9" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">stp_image_t <a class="el" href="structstpui__image__t.html#38f170e2acf7842eb511adf52a1b9de9">stpui_image_t::im</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="c6914425cfe9376043dc64b9ade33b40"></a><!-- doxytag: member="stpui_image_t::transpose" ref="c6914425cfe9376043dc64b9ade33b40" args=")(struct stpui_image *image)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#c6914425cfe9376043dc64b9ade33b40">stpui_image_t::transpose</a>)(struct stpui_image *image)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="0b96d404e3e44afd8272c3534a465740"></a><!-- doxytag: member="stpui_image_t::hflip" ref="0b96d404e3e44afd8272c3534a465740" args=")(struct stpui_image *image)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#0b96d404e3e44afd8272c3534a465740">stpui_image_t::hflip</a>)(struct stpui_image *image)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="167d1341e9223f16afcc3ce4d52c6e72"></a><!-- doxytag: member="stpui_image_t::vflip" ref="167d1341e9223f16afcc3ce4d52c6e72" args=")(struct stpui_image *image)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#167d1341e9223f16afcc3ce4d52c6e72">stpui_image_t::vflip</a>)(struct stpui_image *image)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="de9e076c2a520fe59fbbad51453c05a7"></a><!-- doxytag: member="stpui_image_t::rotate_ccw" ref="de9e076c2a520fe59fbbad51453c05a7" args=")(struct stpui_image *image)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#de9e076c2a520fe59fbbad51453c05a7">stpui_image_t::rotate_ccw</a>)(struct stpui_image *image)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="fb7c04bd61d67e06429fcc88e088774e"></a><!-- doxytag: member="stpui_image_t::rotate_cw" ref="fb7c04bd61d67e06429fcc88e088774e" args=")(struct stpui_image *image)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#fb7c04bd61d67e06429fcc88e088774e">stpui_image_t::rotate_cw</a>)(struct stpui_image *image)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="215928f81c63d90d2ede73606cf95fd8"></a><!-- doxytag: member="stpui_image_t::rotate_180" ref="215928f81c63d90d2ede73606cf95fd8" args=")(struct stpui_image *image)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#215928f81c63d90d2ede73606cf95fd8">stpui_image_t::rotate_180</a>)(struct stpui_image *image)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<a class="anchor" name="77fc83d55bb4367e9698244528cbcbe9"></a><!-- doxytag: member="stpui_image_t::crop" ref="77fc83d55bb4367e9698244528cbcbe9" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image__t.html#77fc83d55bb4367e9698244528cbcbe9">stpui_image_t::crop</a>)(struct stpui_image *image, int left, int top, int right, int bottom)          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-
-</div>
-</div><p>
-<hr>The documentation for this struct was generated from the following file:<ul>
-<li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index 73ec899..3282488 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -4,21 +4,24 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="files.html"><span>Files</span></a></li>
-  </ul>
-</div>
-<div class="tabs">
-  <ul>
-    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
-    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
-    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+      <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+      <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>stpui_plist_t Struct Reference</h1><!-- doxytag: class="stpui_plist_t" --><code>#include &lt;gutenprintui.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -249,8 +252,9 @@
 </div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/tabs.css b/doc/gutenprintui2/html/tabs.css
index c37faaf..95f00a9 100644
--- a/doc/gutenprintui2/html/tabs.css
+++ b/doc/gutenprintui2/html/tabs.css
@@ -94,7 +94,7 @@ DIV.tabs LI.current SPAN
    padding-bottom   : 6px;
 }
 
-DIV.nav
+DIV.navpath
 {
    background       : none;
    border           : none;
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index 50570f9..b2e8571 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -4,14 +4,17 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.3 -->
-<div class="tabs">
-  <ul>
-    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
-    <li class="current"><a href="files.html"><span>Files</span></a></li>
-  </ul>
+<!-- Generated by Doxygen 1.5.5 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
 </div>
+<div class="contents">
 <h1>include/gutenprintui2/typebuiltins.h File Reference</h1><code>#include &lt;glib-object.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -137,8 +140,9 @@
 
 </div>
 </div><p>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by&nbsp;
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Oct 19 15:36:58 2008 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.3 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
 </body>
 </html>
diff --git a/include/Makefile.in b/include/Makefile.in
index 24e5758..7914876 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,7 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -98,6 +99,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -118,6 +120,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -150,6 +153,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -170,9 +174,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -199,6 +204,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -384,8 +390,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -410,8 +416,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -421,13 +427,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index eb13929..6a8e1b2 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -46,7 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -103,6 +104,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -123,6 +125,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -155,6 +158,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -175,9 +179,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -204,6 +209,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -384,8 +390,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -397,8 +403,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -408,13 +414,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/include/gutenprint/gutenprint-intl-internal.h b/include/gutenprint/gutenprint-intl-internal.h
index 5057530..ab8c674 100644
--- a/include/gutenprint/gutenprint-intl-internal.h
+++ b/include/gutenprint/gutenprint-intl-internal.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: gutenprint-intl-internal.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: gutenprint-intl-internal.h,v 1.4 2008/08/13 07:35:51 easysw Exp $"
  *
  *   I18N header file for the gimp-print.
  *
- *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *   Copyright 1997-2008 Michael Sweet (mike@easysw.com),
  *	Robert Krawitz (rlk@alum.mit.edu) and Michael Natterer (mitch@gimp.org)
  *
  *   This program is free software; you can redistribute it and/or modify it
@@ -54,20 +54,20 @@ INCLUDE_LOCALE_H
 #include <locale.h>
 #endif
 
-#if defined ENABLE_NLS && !defined DISABLE_NLS
-#    include <libintl.h>
+#if defined(ENABLE_NLS) && !defined(DISABLE_NLS)
+#  include <libintl.h>
 /** Translate String. */
-#    define _(String) dgettext (PACKAGE, String)
-#    undef gettext
+#  define _(String) dgettext (PACKAGE, String)
+#  undef gettext
 /** Translate String. */
-#    define gettext(String) dgettext (PACKAGE, String)
-#    ifdef gettext_noop
+#  define gettext(String) dgettext (PACKAGE, String)
+#  ifdef gettext_noop
 /** Mark String for translation, but don't translate it right now. */
-#        define N_(String) gettext_noop (String)
-#    else
+#      define N_(String) gettext_noop (String)
+#  else
 /** Mark String for translation, but don't translate it right now. */
 #        define N_(String) (String)
-#    endif
+#  endif
 #else /* ifndef ENABLE_NLS */
 /* Stubs that do something close enough.  */
 #    define textdomain(String) (String)
diff --git a/include/gutenprint/gutenprint-intl.h b/include/gutenprint/gutenprint-intl.h
index e859b3d..afab4a7 100644
--- a/include/gutenprint/gutenprint-intl.h
+++ b/include/gutenprint/gutenprint-intl.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: gutenprint-intl.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $"
+ * "$Id: gutenprint-intl.h,v 1.5 2008/08/13 07:35:51 easysw Exp $"
  *
  *   I18N header file for Gimp-Print.
  *
- *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *   Copyright 1997-2008 Michael Sweet (mike@easysw.com),
  *	Robert Krawitz (rlk@alum.mit.edu) and Michael Natterer (mitch@gimp.org)
  *
  *   This program is free software; you can redistribute it and/or modify it
@@ -52,24 +52,22 @@ INCLUDE_LOCALE_H
 #endif
 
 #ifdef ENABLE_NLS
-
-#include <libintl.h>
-#ifndef _
+#  include <libintl.h>
+#  ifndef _
 /** Translate String. */
-#define _(String) gettext (String)
-#endif
-#ifndef gettext_noop
+#    define _(String) gettext (String)
+#  endif
+#  ifndef gettext_noop
 /** Mark String for translation, but don't translate it right now. */
-#define gettext_noop(String) (String)
-#endif
-#ifdef gettext_noop
+#    define gettext_noop(String) (String)
+#  endif
+#  ifdef gettext_noop
 /** Mark String for translation, but don't translate it right now. */
-# define N_(String) gettext_noop (String)
-#else
+#    define N_(String) gettext_noop (String)
+#  else
 /** Mark String for translation, but don't translate it right now. */
-# define N_(String) (String)
-#endif
-
+#    define N_(String) (String)
+#  endif
 #else /* ifndef ENABLE_NLS */
 /* Stubs that do something close enough.  */
 #    define textdomain(String) (String)
diff --git a/include/gutenprint/mxml.h b/include/gutenprint/mxml.h
index d82a021..3e13f87 100644
--- a/include/gutenprint/mxml.h
+++ b/include/gutenprint/mxml.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mxml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: mxml.h,v 1.2 2008/06/08 15:10:08 rlk Exp $"
  *
  * Header file for mini-XML, a small XML-like file parsing library.
  *
@@ -141,6 +141,8 @@ extern stp_mxml_node_t	*stp_mxmlFindElement(stp_mxml_node_t *node, stp_mxml_node
 					 const char *value, int descend);
 extern stp_mxml_node_t	*stp_mxmlLoadFile(stp_mxml_node_t *top, FILE *fp,
 			              stp_mxml_type_t (*cb)(stp_mxml_node_t *));
+extern stp_mxml_node_t	*stp_mxmlLoadFromFile(stp_mxml_node_t *top, const char *file,
+			              stp_mxml_type_t (*cb)(stp_mxml_node_t *));
 extern stp_mxml_node_t	*stp_mxmlLoadString(stp_mxml_node_t *top, const char *s,
 			                stp_mxml_type_t (*cb)(stp_mxml_node_t *));
 extern stp_mxml_node_t	*stp_mxmlNewElement(stp_mxml_node_t *parent, const char *name);
@@ -154,6 +156,8 @@ extern char		*stp_mxmlSaveAllocString(stp_mxml_node_t *node,
 			        	     int (*cb)(stp_mxml_node_t *, int));
 extern int		stp_mxmlSaveFile(stp_mxml_node_t *node, FILE *fp,
 			             int (*cb)(stp_mxml_node_t *, int));
+extern int		stp_mxmlSaveToFile(stp_mxml_node_t *node, const char *fp,
+			             int (*cb)(stp_mxml_node_t *, int));
 extern int		stp_mxmlSaveString(stp_mxml_node_t *node, char *buffer,
 			               int bufsize,
 			               int (*cb)(stp_mxml_node_t *, int));
@@ -174,5 +178,5 @@ extern stp_mxml_node_t	*stp_mxmlWalkPrev(stp_mxml_node_t *node, stp_mxml_node_t
 
 
 /*
- * End of "$Id: mxml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: mxml.h,v 1.2 2008/06/08 15:10:08 rlk Exp $".
  */
diff --git a/include/gutenprint/paper.h b/include/gutenprint/paper.h
index e9c14ed..26ee9ae 100644
--- a/include/gutenprint/paper.h
+++ b/include/gutenprint/paper.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: paper.h,v 1.2 2008/01/15 03:48:45 rlk Exp $"
+ * "$Id: paper.h,v 1.4 2008/07/12 15:05:54 rlk Exp $"
  *
  *   libgimpprint paper functions.
  *
@@ -103,31 +103,47 @@ extern int stp_known_papersizes(void);
 /**
  * Get a papersize by name.
  * @param name the short unique name of the paper.
- * @returns a pointer to the papersize, or NULL on failure.  The
- * pointer should not be freed.
+ * @returns a static pointer to the papersize, or NULL on failure.
  */
 extern const stp_papersize_t *stp_get_papersize_by_name(const char *name);
 
 /**
  * Get a papersize by size.
  * The nearest available size to the size requested will be found.
+ * Only paper sizes within 5 points of width and height will be considered.
  * @param length the length of the paper.
  * @param width the width of the paper
- * @returns a pointer to the papersize, or NULL on failure.  The
- * pointer should not be freed.
+ * @returns a static pointer to the papersize, or NULL on failure.
  */
 extern const stp_papersize_t *stp_get_papersize_by_size(int length,
 							int width);
 
 /**
+ * Get a papersize by size if an exact match is found.
+ * @param length the length of the paper.
+ * @param width the width of the paper
+ * @returns a static pointer to the papersize, or NULL on failure.
+ */
+extern const stp_papersize_t *stp_get_papersize_by_size_exact(int length,
+							      int width);
+
+/**
  * Get a papersize by its index number.
  * @param idx the index number.  This must not be greater than (total
  * number of papers - 1).
- * @returns a pointer to the papersize, or NULL on failure.  The
- * pointer should not be freed.
+ * @returns a static pointer to the papersize, or NULL on failure.
  */
 extern const stp_papersize_t *stp_get_papersize_by_index(int idx);
 
+/**
+ * Get the default paper dimensions for the current configuration.
+ * 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.
+ * @param v the Gutenprint vars object
+ * @param width pointer to storage that the width will be returned in.
+ * @param height pointer to storage that the height will be returned in.
+ */
 extern void stp_default_media_size(const stp_vars_t *v,
 				   int *width, int *height);
 
@@ -139,5 +155,5 @@ extern void stp_default_media_size(const stp_vars_t *v,
 
 #endif /* GUTENPRINT_PAPER_H */
 /*
- * End of "$Id: paper.h,v 1.2 2008/01/15 03:48:45 rlk Exp $".
+ * End of "$Id: paper.h,v 1.4 2008/07/12 15:05:54 rlk Exp $".
  */
diff --git a/include/gutenprint/path.h b/include/gutenprint/path.h
index e08c9ed..b7c4b44 100644
--- a/include/gutenprint/path.h
+++ b/include/gutenprint/path.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: path.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: path.h,v 1.2 2008/06/01 14:41:03 rlk Exp $"
  *
  *   libgimpprint path functions header
  *
@@ -46,6 +46,12 @@ extern stp_list_t *stp_path_search(stp_list_t *dirlist,
 extern void stp_path_split(stp_list_t *list,
 			   const char *path);
 
+extern stp_list_t *stpi_data_path(void);
+
+extern stp_list_t *stpi_list_files_on_data_path(const char *name);
+
+extern char *stpi_path_merge(const char *path, const char *file);
+
 
 #ifdef __cplusplus
   }
@@ -53,5 +59,5 @@ extern void stp_path_split(stp_list_t *list,
 
 #endif /* GUTENPRINT_PATH_H */
 /*
- * End of "$Id: path.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: path.h,v 1.2 2008/06/01 14:41:03 rlk Exp $".
  */
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 6b99642..86a9462 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.4 2007/08/27 00:44:12 rlk Exp $"
+ * "$Id: printers.h,v 1.5 2008/06/03 11:40:39 rlk Exp $"
  *
  *   libgimpprint printer functions.
  *
@@ -148,13 +148,21 @@ extern int stp_printer_get_model(const stp_printer_t *p);
 extern const stp_vars_t *stp_printer_get_defaults(const stp_printer_t *p);
 
 /**
- * Set a vars object to use a particular driver, and set the parameter
- * to its defaults.
+ * Set a vars object to use a particular driver, and set the parameters
+ * to their defaults.
  * @param v the vars to use.
  * @param p the printer model to use.
  */
 extern void stp_set_printer_defaults(stp_vars_t *v, const stp_printer_t *p);
 
+/**
+ * Set a vars object to use a particular driver, and set any unset parameters
+ * to their defaults.
+ * @param v the vars to use.
+ * @param p the printer model to use.
+ */
+extern void stp_set_printer_defaults_soft(stp_vars_t *v, const stp_printer_t *p);
+
 
 /**
  * Print the image.
@@ -247,5 +255,5 @@ const char *stp_describe_output(const stp_vars_t *v);
 
 #endif /* GUTENPRINT_PRINTERS_H */
 /*
- * End of "$Id: printers.h,v 1.4 2007/08/27 00:44:12 rlk Exp $".
+ * End of "$Id: printers.h,v 1.5 2008/06/03 11:40:39 rlk Exp $".
  */
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index 1174d59..db322f1 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.6 2007/09/09 21:13:55 rlk Exp $"
+ * "$Id: util.h,v 1.7 2008/07/13 18:05:10 rlk Exp $"
  *
  *   libgimpprint utility and miscellaneous functions.
  *
@@ -129,6 +129,7 @@ extern void stp_catprintf(char **strp, const char *format, ...)
 #define STP_DBG_CURVE		0x80000
 #define STP_DBG_CURVE_ERRORS	0x100000
 #define STP_DBG_PPD		0x200000
+#define STP_DBG_NO_COMPRESSION	0x400000
 
 extern unsigned long stp_get_debug_level(void);
 extern void stp_dprintf(unsigned long level, const stp_vars_t *v,
@@ -179,5 +180,5 @@ extern const char *stp_get_release_version(void);
 
 #endif /* GUTENPRINT_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.6 2007/09/09 21:13:55 rlk Exp $".
+ * End of "$Id: util.h,v 1.7 2008/07/13 18:05:10 rlk Exp $".
  */
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index 774876a..ae93656 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -146,6 +146,8 @@ typedef struct
   int upper; /*!< Upper bound. */
 } stp_int_bound_t;
 
+#define STP_CHANNEL_NONE ((unsigned char) -1)
+
 /** Parameter description. */
 typedef struct
 {
@@ -962,13 +964,95 @@ extern void stp_clear_array_parameter(stp_vars_t *v, const char *parameter);
 extern void stp_clear_raw_parameter(stp_vars_t *v, const char *parameter);
 
 /**
+ * Clear a parameter.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param type the type of the parameter.
+ */
+extern void stp_clear_parameter(stp_vars_t *v, const char *parameter, stp_parameter_type_t type);
+
+
+/**
+ * List all string parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_string_parameters(const stp_vars_t *v);
+
+/**
+ * List all file parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_file_parameters(const stp_vars_t *v);
+
+/**
+ * List all float parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_float_parameters(const stp_vars_t *v);
+
+/**
+ * List all integer parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_int_parameters(const stp_vars_t *v);
+
+/**
+ * List all dimension parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_dimension_parameters(const stp_vars_t *v);
+
+/**
+ * List all boolean parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_boolean_parameters(const stp_vars_t *v);
+
+/**
+ * List all curve parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_curve_parameters(const stp_vars_t *v);
+
+/**
+ * List all array parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_array_parameters(const stp_vars_t *v);
+
+/**
+ * List all raw parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ */
+extern stp_string_list_t *stp_list_raw_parameters(const stp_vars_t *v);
+
+/**
+ * List all parameters.
+ * The return value must be freed after use.
+ * @param v the vars to use.
+ * @param type the type of the parameter.
+ */
+extern stp_string_list_t *stp_list_parameters(const stp_vars_t *v,
+					      stp_parameter_type_t type);
+
+
+/**
  * Set the activity of a string parameter.
  * @param v the vars to use.
  * @param parameter the name of the parameter.
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_string_parameter_active(const stp_vars_t *v,
+extern void stp_set_string_parameter_active(stp_vars_t *v,
 					    const char *parameter,
 					    stp_parameter_activity_t active);
 
@@ -979,7 +1063,7 @@ extern void stp_set_string_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_file_parameter_active(const stp_vars_t *v,
+extern void stp_set_file_parameter_active(stp_vars_t *v,
 					  const char *parameter,
 					  stp_parameter_activity_t active);
 
@@ -990,7 +1074,7 @@ extern void stp_set_file_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_float_parameter_active(const stp_vars_t *v,
+extern void stp_set_float_parameter_active(stp_vars_t *v,
 					 const char *parameter,
 					 stp_parameter_activity_t active);
 
@@ -1001,7 +1085,7 @@ extern void stp_set_float_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_int_parameter_active(const stp_vars_t *v,
+extern void stp_set_int_parameter_active(stp_vars_t *v,
 					 const char *parameter,
 					 stp_parameter_activity_t active);
 
@@ -1012,7 +1096,7 @@ extern void stp_set_int_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_dimension_parameter_active(const stp_vars_t *v,
+extern void stp_set_dimension_parameter_active(stp_vars_t *v,
 					       const char *parameter,
 					       stp_parameter_activity_t active);
 
@@ -1023,7 +1107,7 @@ extern void stp_set_dimension_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_boolean_parameter_active(const stp_vars_t *v,
+extern void stp_set_boolean_parameter_active(stp_vars_t *v,
 					     const char *parameter,
 					     stp_parameter_activity_t active);
 
@@ -1034,7 +1118,7 @@ extern void stp_set_boolean_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_curve_parameter_active(const stp_vars_t *v,
+extern void stp_set_curve_parameter_active(stp_vars_t *v,
 					   const char *parameter,
 					   stp_parameter_activity_t active);
 
@@ -1045,7 +1129,7 @@ extern void stp_set_curve_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_array_parameter_active(const stp_vars_t *v,
+extern void stp_set_array_parameter_active(stp_vars_t *v,
 					   const char *parameter,
 					   stp_parameter_activity_t active);
 
@@ -1056,11 +1140,24 @@ extern void stp_set_array_parameter_active(const stp_vars_t *v,
  * @param active the activity status to set (should be set to
  * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
  */
-extern void stp_set_raw_parameter_active(const stp_vars_t *v,
+extern void stp_set_raw_parameter_active(stp_vars_t *v,
 					 const char *parameter,
 					 stp_parameter_activity_t active);
 
 /**
+ * Set the activity of a parameter.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param active the activity status to set (should be set to
+ * STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).
+ * @param type the type of the parameter.
+ */
+extern void stp_set_parameter_active(stp_vars_t *v,
+				     const char *parameter,
+				     stp_parameter_activity_t active,
+				     stp_parameter_type_t type);
+
+/**
  * Check if a string parameter is set.
  * @param v the vars to use.
  * @param parameter the name of the parameter.
@@ -1142,6 +1239,17 @@ extern int stp_check_raw_parameter(const stp_vars_t *v, const char *parameter,
 				   stp_parameter_activity_t active);
 
 /**
+ * Check if a parameter is set.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param active the minimum activity status.
+ * @param type the type of the parameter.
+ */
+extern int stp_check_parameter(const stp_vars_t *v, const char *parameter,
+			       stp_parameter_activity_t active,
+			       stp_parameter_type_t type);
+
+/**
  * Get the activity status of a string parameter.
  * @param v the vars to use.
  * @param parameter the name of the parameter.
@@ -1222,6 +1330,16 @@ stp_get_array_parameter_active(const stp_vars_t *v, const char *parameter);
 extern stp_parameter_activity_t
 stp_get_raw_parameter_active(const stp_vars_t *v, const char *parameter);
 
+/**
+ * Get the activity status of a parameter.
+ * @param v the vars to use.
+ * @param parameter the name of the parameter.
+ * @param type the type of the parameter.
+ */
+extern stp_parameter_activity_t
+stp_get_parameter_active(const stp_vars_t *v, const char *parameter,
+			 stp_parameter_type_t type);
+
 
 
 /****************************************************************
@@ -1383,5 +1501,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
 
 #endif /* GUTENPRINT_VARS_H */
 /*
- * End of "$Id: vars.h,v 1.4 2007/01/23 01:18:16 rlk Exp $".
+ * End of "$Id: vars.h,v 1.7 2008/07/04 14:29:27 rlk Exp $".
  */
diff --git a/include/gutenprint/xml.h b/include/gutenprint/xml.h
index 5f88686..4b3f424 100644
--- a/include/gutenprint/xml.h
+++ b/include/gutenprint/xml.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $"
+ * "$Id: xml.h,v 1.4 2008/07/06 02:17:42 rlk Exp $"
  *
  *   Gutenprint module loader header
  *
@@ -53,6 +53,10 @@ extern int stp_xml_parse_file(const char *file);
 extern long stp_xmlstrtol(const char *value);
 extern unsigned long stp_xmlstrtoul(const char *value);
 extern double stp_xmlstrtod(const char *textval);
+extern stp_raw_t *stp_xmlstrtoraw(const char *textval);
+extern char *stp_rawtoxmlstr(const stp_raw_t *raw);
+extern char *stp_strtoxmlstr(const char *raw);
+extern void stp_prtraw(const stp_raw_t *raw, FILE *fp);
 
 extern void stp_xml_init(void);
 extern void stp_xml_exit(void);
@@ -67,7 +71,16 @@ extern stp_curve_t *stp_curve_create_from_xmltree(stp_mxml_node_t *da);
 extern stp_mxml_node_t *stp_xmltree_create_from_curve(const stp_curve_t *curve);
 
 extern stp_array_t *stp_array_create_from_xmltree(stp_mxml_node_t *array);
+extern stp_vars_t *stp_vars_create_from_xmltree(stp_mxml_node_t *da);
 extern stp_mxml_node_t *stp_xmltree_create_from_array(const stp_array_t *array);
+extern stp_vars_t *stp_vars_create_from_xmltree_ref(stp_mxml_node_t *da,
+						    stp_mxml_node_t *root);
+extern void stp_vars_fill_from_xmltree(stp_mxml_node_t *da, stp_vars_t *v);
+extern void stp_vars_fill_from_xmltree_ref(stp_mxml_node_t *da,
+					   stp_mxml_node_t *root,
+					   stp_vars_t *v);
+extern stp_mxml_node_t *stp_xmltree_create_from_vars(const stp_vars_t *v);
+
 extern void stp_xml_parse_file_named(const char *name);
 
 #ifdef __cplusplus
@@ -76,5 +89,5 @@ extern void stp_xml_parse_file_named(const char *name);
 
 #endif /* GUTENPRINT_XML_H */
 /*
- * End of "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $".
+ * End of "$Id: xml.h,v 1.4 2008/07/06 02:17:42 rlk Exp $".
  */
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index b9626db..868ba48 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -43,7 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -100,6 +101,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -120,6 +122,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -152,6 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -172,9 +176,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -201,6 +206,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -345,8 +351,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -358,8 +364,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -369,13 +375,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 59535eb..223955b 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,10 +1,8 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -12,7 +10,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
 [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
     [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
       am_cv_langinfo_codeset=yes,
       am_cv_langinfo_codeset=no)
     ])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index d779926..b5ce322 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,10 +1,8 @@
-# gettext.m4 serial 17 (gettext-0.11.5)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# gettext.m4 serial 58 (gettext-0.16)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -17,7 +15,7 @@ dnl They are *not* in the public domain.
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
 
 dnl Macro to add for using GNU gettext.
 
@@ -65,8 +63,13 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
+  define([gt_included_intl],
+    ifelse([$1], [external],
+      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
+      [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+  gt_NEEDS_INIT
+  AM_GNU_GETTEXT_NEED([$2])
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl
   ifelse(gt_included_intl, yes, [
@@ -80,7 +83,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
   dnl Sometimes libintl requires libiconv, so first search for libiconv.
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
   dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
@@ -92,13 +95,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AC_REQUIRE([AM_NLS])
 
   ifelse(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
@@ -108,6 +109,15 @@ AC_DEFUN([AM_GNU_GETTEXT],
   LTLIBINTL=
   POSUB=
 
+  dnl Add a version number to the cache macros.
+  case " $gt_needs " in
+    *" need-formatstring-macros "*) gt_api_version=3 ;;
+    *" need-ngettext "*) gt_api_version=2 ;;
+    *) gt_api_version=1 ;;
+  esac
+  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
@@ -126,28 +136,33 @@ AC_DEFUN([AM_GNU_GETTEXT],
         dnl to use.  If GNU gettext is available we use this.  Else we have
         dnl to fall back to GNU NLS library.
 
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+        if test $gt_api_version -ge 3; then
+          gt_revision_test_code='[[
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
-changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+]]'
+        else
+          gt_revision_test_code=
+        fi
+        if test $gt_api_version -ge 2; then
+          gt_expression_test_code=' + * ngettext ("", "", 0)'
+        else
+          gt_expression_test_code=
+        fi
+
+        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
+         [AC_TRY_LINK([#include <libintl.h>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            [eval "$gt_func_gnugettext_libc=yes"],
+            [eval "$gt_func_gnugettext_libc=no"])])
 
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
           ifelse(gt_included_intl, yes, , [
             AM_ICONV_LINK
@@ -158,52 +173,40 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
           dnl even if libiconv doesn't exist.
           AC_LIB_LINKFLAGS_BODY([intl])
           AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
+            [$gt_func_gnugettext_libintl],
            [gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
               [bindtextdomain ("", "");
-return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              [eval "$gt_func_gnugettext_libintl=yes"],
+              [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
                 [bindtextdomain ("", "");
-return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
+                eval "$gt_func_gnugettext_libintl=yes"
                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
@@ -214,9 +217,10 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
         dnl use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
+        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
+           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
         else
           dnl Reset the values set by searching for libintl.
@@ -235,14 +239,14 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
+      CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions to use GNU gettext tools.
@@ -250,6 +254,15 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
       fi
     ])
 
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       AC_DEFINE(ENABLE_NLS, 1,
@@ -260,10 +273,26 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
     fi
   fi
 
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         AC_MSG_CHECKING([how to link with libintl])
         AC_MSG_RESULT([$LIBINTL])
         AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
@@ -283,7 +312,7 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
   ifelse(gt_included_intl, yes, [
     dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
     dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
       BUILD_INCLUDED_LIBINTL=yes
     fi
 
@@ -291,7 +320,6 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
     AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATOBJEXT)
-    AC_SUBST(INTLOBJS)
 
     dnl For backward compatibility. Some configure.ins may be using this.
     nls_cv_header_intl=
@@ -309,6 +337,13 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
     GENCAT=gencat
     AC_SUBST(GENCAT)
 
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST(INTLOBJS)
+
     dnl Enable libtool support if the surrounding package wishes it.
     INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
     AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
@@ -325,261 +360,56 @@ return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext (""
 ])
 
 
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
-AC_DEFUN([AM_PO_SUBDIRS],
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
 [
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
   fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
   fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
 ])
 
 
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
 [
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
 ])
 
 
-AC_DEFUN([AM_MKINSTALLDIRS],
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
 [
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate is.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
 ])
 
 
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
new file mode 100644
index 0000000..e8f5bfe
--- /dev/null
+++ b/m4/glibc2.m4
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 1
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+      ac_cv_gnu_library_2,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2=yes,
+	ac_cv_gnu_library_2=no)
+      ]
+    )
+    AC_SUBST(GLIBC2)
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 9c9f3db..d95fd98 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,15 +1,13 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 # Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
 
-AC_DEFUN([jm_GLIBC21],
+AC_DEFUN([gl_GLIBC21],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
       ac_cv_gnu_library_2_1,
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index c5f3579..654c415 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,10 +1,8 @@
 # iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index 55dddcf..b8d7817 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,10 +1,8 @@
 # intdiv0.m4 serial 1 (gettext-0.11.3)
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
diff --git a/m4/intl.m4 b/m4/intl.m4
new file mode 100644
index 0000000..dcefb11
--- /dev/null
+++ b/m4/intl.m4
@@ -0,0 +1,259 @@
+# intl.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
+
+AC_PREREQ(2.52)
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([gl_VISIBILITY])dnl
+  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+  AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_LANGINFO_CODESET
+  gt_LC_MESSAGES
+
+  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
+  dnl 1. when we install a shared library, we must arrange to export
+  dnl    auxiliary pointer variables for every exported variable,
+  dnl 2. when we install a shared library and a static library simultaneously,
+  dnl    the include file specifies __declspec(dllimport) and therefore we
+  dnl    must arrange to define the auxiliary pointer variables for the
+  dnl    exported variables _also_ in the static library.
+  if test "$enable_shared" = yes; then
+    case "$host_os" in
+      cygwin*) is_woe32dll=yes ;;
+      *) is_woe32dll=no ;;
+    esac
+  else
+    is_woe32dll=no
+  fi
+  WOE32DLL=$is_woe32dll
+  AC_SUBST([WOE32DLL])
+
+  dnl Rename some macros and functions used for locking.
+  AH_BOTTOM([
+#define __libc_lock_t                   gl_lock_t
+#define __libc_lock_define              gl_lock_define
+#define __libc_lock_define_initialized  gl_lock_define_initialized
+#define __libc_lock_init                gl_lock_init
+#define __libc_lock_lock                gl_lock_lock
+#define __libc_lock_unlock              gl_lock_unlock
+#define __libc_lock_recursive_t                   gl_recursive_lock_t
+#define __libc_lock_define_recursive              gl_recursive_lock_define
+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
+#define __libc_lock_init_recursive                gl_recursive_lock_init
+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
+#define glthread_in_use  libintl_thread_in_use
+#define glthread_lock_init     libintl_lock_init
+#define glthread_lock_lock     libintl_lock_lock
+#define glthread_lock_unlock   libintl_lock_unlock
+#define glthread_lock_destroy  libintl_lock_destroy
+#define glthread_rwlock_init     libintl_rwlock_init
+#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
+#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
+#define glthread_rwlock_unlock   libintl_rwlock_unlock
+#define glthread_rwlock_destroy  libintl_rwlock_destroy
+#define glthread_recursive_lock_init     libintl_recursive_lock_init
+#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
+#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
+#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
+#define glthread_once                 libintl_once
+#define glthread_once_call            libintl_once_call
+#define glthread_once_singlethreaded  libintl_once_singlethreaded
+])
+])
+
+
+dnl Checks for the core files of the intl subdirectory:
+dnl   dcigettext.c
+dnl   eval-plural.h
+dnl   explodename.c
+dnl   finddomain.c
+dnl   gettextP.h
+dnl   gmo.h
+dnl   hash-string.h hash-string.c
+dnl   l10nflist.c
+dnl   libgnuintl.h.in (except the *printf stuff)
+dnl   loadinfo.h
+dnl   loadmsgcat.c
+dnl   localealias.c
+dnl   log.c
+dnl   plural-exp.h plural-exp.c
+dnl   plural.y
+dnl Used by libglocale.
+AC_DEFUN([gt_INTL_SUBDIR_CORE],
+[
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_LOCK])dnl
+
+  AC_TRY_LINK(
+    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],
+    [],
+    [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
+       [Define to 1 if the compiler understands __builtin_expect.])])
+
+  AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
+    stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+    argz_next __fsetlocking])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+
+  AM_ICONV
+
+  dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
+  dnl and a _NL_LOCALE_NAME macro always.
+  AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
+    [AC_TRY_LINK([#include <langinfo.h>
+#include <locale.h>],
+      [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
+      gt_cv_nl_locale_name=yes,
+      gt_cv_nl_locale_name=no)
+    ])
+  if test $gt_cv_nl_locale_name = yes; then
+    AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
+      [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.])
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
new file mode 100644
index 0000000..7a28843
--- /dev/null
+++ b/m4/intldir.m4
@@ -0,0 +1,19 @@
+# intldir.m4 serial 1 (gettext-0.16)
+dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+AC_PREREQ(2.52)
+
+dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
new file mode 100644
index 0000000..ce7a8a4
--- /dev/null
+++ b/m4/intmax.m4
@@ -0,0 +1,33 @@
+# intmax.m4 serial 3 (gettext-0.16)
+dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+],     [intmax_t x = -1;
+        return !x;],
+       gt_cv_c_intmax_t=yes,
+       gt_cv_c_intmax_t=no)])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE(HAVE_INTMAX_T, 1,
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index fd007c3..7c7f894 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -1,20 +1,20 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# inttypes-pri.m4 serial 4 (gettext-0.16)
+dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.52)
+
 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
 # macros to non-string values.  This is the case on AIX 4.3.3.
 
 AC_DEFUN([gt_INTTYPES_PRI],
 [
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
+  AC_CHECK_HEADERS([inttypes.h])
+  if test $ac_cv_header_inttypes_h = yes; then
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [
@@ -28,5 +28,9 @@ char *p = PRId32;
   if test "$gt_cv_inttypes_pri_broken" = yes; then
     AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
       [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+    PRI_MACROS_BROKEN=1
+  else
+    PRI_MACROS_BROKEN=0
   fi
+  AC_SUBST([PRI_MACROS_BROKEN])
 ])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 400a111..edc8ecb 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,28 +1,26 @@
-# inttypes_h.m4 serial 4 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
 # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
 [
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
+  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    gl_cv_header_inttypes_h=yes,
+    gl_cv_header_inttypes_h=no)])
+  if test $gl_cv_header_inttypes_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
   fi
 ])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index ffd4008..19aa77e 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,10 +1,8 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lcmessage.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -20,12 +18,12 @@ dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
 
 # Check whether LC_MESSAGES is available in <locale.h>.
 
-AC_DEFUN([AM_LC_MESSAGES],
+AC_DEFUN([gt_LC_MESSAGES],
 [
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
     [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-  if test $am_cv_val_LC_MESSAGES = yes; then
+       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
+  if test $gt_cv_val_LC_MESSAGES = yes; then
     AC_DEFINE(HAVE_LC_MESSAGES, 1,
       [Define if your <locale.h> file defines LC_MESSAGES.])
   fi
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index ddb5732..96c4e2c 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,10 +1,8 @@
-# lib-ld.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
 dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
@@ -14,11 +12,12 @@ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
@@ -29,6 +28,19 @@ AC_DEFUN([AC_LIB_PROG_LD],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
@@ -75,11 +87,12 @@ AC_CACHE_VAL(acl_cv_path_LD,
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
     fi
   done
   IFS="$ac_save_ifs"
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 6b94251..f95b7ba 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,13 +1,13 @@
-# lib-link.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 9 (gettext-0.16)
+dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+AC_PREREQ(2.50)
+
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -92,10 +92,11 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
+dnl hardcode_direct, hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
@@ -114,8 +115,6 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
   dnl Determine whether the user wants rpath handling at all.
   AC_ARG_ENABLE(rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
@@ -127,6 +126,7 @@ dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   dnl By default, look in $includedir and $libdir.
@@ -135,7 +135,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_ARG_WITH([lib$1-prefix],
+  AC_LIB_ARG_WITH([lib$1-prefix],
 [  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
   --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
 [
@@ -149,7 +149,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 ])
@@ -198,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -220,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -249,7 +263,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -335,8 +349,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             dnl Assume the include files are nearby.
             additional_includedir=
             case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -353,7 +367,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -397,12 +411,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     dnl   3. if it's already present in $LDFLAGS or the already
                     dnl      constructed $LIBNAME,
                     dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -552,3 +566,79 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
     fi
   done
 ])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index b8b79ab..a8684e1 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,13 +1,18 @@
-# lib-prefix.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 5 (gettext-0.15)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that
 dnl a user will want packages to use other packages he previously installed
@@ -19,6 +24,7 @@ AC_DEFUN([AC_LIB_PREFIX],
   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
@@ -26,7 +32,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_ARG_WITH([lib-prefix],
+  AC_LIB_ARG_WITH([lib-prefix],
 [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
   --without-lib-prefix    don't search for libraries in includedir and libdir],
 [
@@ -40,7 +46,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
+        additional_libdir="$withval/$acl_libdirstem"
       fi
     fi
 ])
@@ -64,7 +70,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         if test "X$additional_includedir" = "X/usr/local/include"; then
           if test -n "$GCC"; then
             case $host_os in
-              linux*) haveit=yes;;
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
             esac
           fi
         fi
@@ -82,7 +88,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     dnl   2. if it's already present in $LDFLAGS,
     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
     dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
       haveit=
       for x in $LDFLAGS; do
         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
@@ -92,7 +98,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
           if test -n "$GCC"; then
             case $host_os in
               linux*) haveit=yes;;
@@ -146,3 +152,34 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 ])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64. The current
+  dnl practice is that on a system supporting 32-bit and 64-bit instruction
+  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+  dnl libraries go under $prefix/lib. We determine the compiler's default
+  dnl mode by looking at the compiler's library search path. If at least
+  dnl of its elements ends in /lib64 or points to a directory whose absolute
+  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+  dnl default, namely "lib".
+  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+])
diff --git a/m4/lock.m4 b/m4/lock.m4
new file mode 100644
index 0000000..0224f2f
--- /dev/null
+++ b/m4/lock.m4
@@ -0,0 +1,311 @@
+# lock.m4 serial 6 (gettext-0.16)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests for a multithreading library to be used.
+dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
+dnl USE_PTH_THREADS, USE_WIN32_THREADS
+dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
+dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
+dnl libtool).
+dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
+dnl programs that really need multithread functionality. The difference
+dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
+dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
+dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
+dnl multithread-safe programs.
+
+AC_DEFUN([gl_LOCK_EARLY],
+[
+  AC_REQUIRE([gl_LOCK_EARLY_BODY])
+])
+
+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_EARLY_BODY],
+[
+  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
+  dnl influences the result of the autoconf tests that test for *_unlocked
+  dnl declarations, on AIX 5 at least. Therefore it must come early.
+  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
+  AC_BEFORE([$0], [gl_ARGP])dnl
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems
+  dnl Check for multithreading.
+  AC_ARG_ENABLE(threads,
+AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
+AC_HELP_STRING([--disable-threads], [build without multithread safety]),
+    [gl_use_threads=$enableval],
+    [case "$host_os" in
+       dnl Disable multithreading by default on OSF/1, because it interferes
+       dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
+       dnl process gets an endless segmentation fault inside execvp().
+       osf*) gl_use_threads=no ;;
+       *)    gl_use_threads=yes ;;
+     esac
+    ])
+  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+    # For using <pthread.h>:
+    case "$host_os" in
+      osf*)
+        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+        # groks <pthread.h>. cc also understands the flag -pthread, but
+        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # 2. putting a flag into CPPFLAGS that has an effect on the linker
+        # causes the AC_TRY_LINK test below to succeed unexpectedly,
+        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
+        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+        ;;
+    esac
+    # Some systems optimize for single-threaded programs by default, and
+    # need special flags to disable these optimizations. For example, the
+    # definition of 'errno' in <errno.h>.
+    case "$host_os" in
+      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
+      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
+    esac
+  fi
+])
+
+dnl The guts of gl_LOCK. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_BODY],
+[
+  AC_REQUIRE([gl_LOCK_EARLY_BODY])
+  gl_threads_api=none
+  LIBTHREAD=
+  LTLIBTHREAD=
+  LIBMULTITHREAD=
+  LTLIBMULTITHREAD=
+  if test "$gl_use_threads" != no; then
+    dnl Check whether the compiler and linker support weak declarations.
+    AC_MSG_CHECKING([whether imported symbols can be declared weak])
+    gl_have_weak=no
+    AC_TRY_LINK([extern void xyzzy ();
+#pragma weak xyzzy], [xyzzy();], [gl_have_weak=yes])
+    AC_MSG_RESULT([$gl_have_weak])
+    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+      # it groks <pthread.h>. It's added above, in gl_LOCK_EARLY_BODY.
+      AC_CHECK_HEADER(pthread.h, gl_have_pthread_h=yes, gl_have_pthread_h=no)
+      if test "$gl_have_pthread_h" = yes; then
+        # Other possible tests:
+        #   -lpthreads (FSU threads, PCthreads)
+        #   -lgthreads
+        gl_have_pthread=
+        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
+        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
+        # the second one only in libpthread, and lock.c needs it.
+        AC_TRY_LINK([#include <pthread.h>],
+          [pthread_mutex_lock((pthread_mutex_t*)0);
+           pthread_mutexattr_init((pthread_mutexattr_t*)0);],
+          [gl_have_pthread=yes])
+        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
+        # since it is defined as a macro on OSF/1.)
+        if test -n "$gl_have_pthread"; then
+          # The program links fine without libpthread. But it may actually
+          # need to link with libpthread in order to create multiple threads.
+          AC_CHECK_LIB(pthread, pthread_kill,
+            [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+             # On Solaris and HP-UX, most pthread functions exist also in libc.
+             # Therefore pthread_in_use() needs to actually try to create a
+             # thread: pthread_create from libc will fail, whereas
+             # pthread_create will actually create a thread.
+             case "$host_os" in
+               solaris* | hpux*)
+                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1,
+                   [Define if the pthread_in_use() detection is hard.])
+             esac
+            ])
+        else
+          # Some library is needed. Try libpthread and libc_r.
+          AC_CHECK_LIB(pthread, pthread_kill,
+            [gl_have_pthread=yes
+             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
+          if test -z "$gl_have_pthread"; then
+            # For FreeBSD 4.
+            AC_CHECK_LIB(c_r, pthread_kill,
+              [gl_have_pthread=yes
+               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
+          fi
+        fi
+        if test -n "$gl_have_pthread"; then
+          gl_threads_api=posix
+          AC_DEFINE([USE_POSIX_THREADS], 1,
+            [Define if the POSIX multithreading library can be used.])
+          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+            if test $gl_have_weak = yes; then
+              AC_DEFINE([USE_POSIX_THREADS_WEAK], 1,
+                [Define if references to the POSIX multithreading library should be made weak.])
+              LIBTHREAD=
+              LTLIBTHREAD=
+            fi
+          fi
+          # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the
+          # pthread_rwlock_* functions.
+          AC_CHECK_TYPE([pthread_rwlock_t],
+            [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1,
+               [Define if the POSIX multithreading library has read/write locks.])],
+            [],
+            [#include <pthread.h>])
+          # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
+          AC_TRY_COMPILE([#include <pthread.h>],
+            [#if __FreeBSD__ == 4
+error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
+#else
+int x = (int)PTHREAD_MUTEX_RECURSIVE;
+return !x;
+#endif],
+            [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
+               [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
+        fi
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
+        gl_have_solaristhread=
+        gl_save_LIBS="$LIBS"
+        LIBS="$LIBS -lthread"
+        AC_TRY_LINK([#include <thread.h>
+#include <synch.h>],
+          [thr_self();],
+          [gl_have_solaristhread=yes])
+        LIBS="$gl_save_LIBS"
+        if test -n "$gl_have_solaristhread"; then
+          gl_threads_api=solaris
+          LIBTHREAD=-lthread
+          LTLIBTHREAD=-lthread
+          LIBMULTITHREAD="$LIBTHREAD"
+          LTLIBMULTITHREAD="$LTLIBTHREAD"
+          AC_DEFINE([USE_SOLARIS_THREADS], 1,
+            [Define if the old Solaris multithreading library can be used.])
+          if test $gl_have_weak = yes; then
+            AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1,
+              [Define if references to the old Solaris multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      fi
+    fi
+    if test "$gl_use_threads" = pth; then
+      gl_save_CPPFLAGS="$CPPFLAGS"
+      AC_LIB_LINKFLAGS(pth)
+      gl_have_pth=
+      gl_save_LIBS="$LIBS"
+      LIBS="$LIBS -lpth"
+      AC_TRY_LINK([#include <pth.h>], [pth_self();], gl_have_pth=yes)
+      LIBS="$gl_save_LIBS"
+      if test -n "$gl_have_pth"; then
+        gl_threads_api=pth
+        LIBTHREAD="$LIBPTH"
+        LTLIBTHREAD="$LTLIBPTH"
+        LIBMULTITHREAD="$LIBTHREAD"
+        LTLIBMULTITHREAD="$LTLIBTHREAD"
+        AC_DEFINE([USE_PTH_THREADS], 1,
+          [Define if the GNU Pth multithreading library can be used.])
+        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+          if test $gl_have_weak = yes; then
+            AC_DEFINE([USE_PTH_THREADS_WEAK], 1,
+              [Define if references to the GNU Pth multithreading library should be made weak.])
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      else
+        CPPFLAGS="$gl_save_CPPFLAGS"
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
+        if { case "$host_os" in
+               mingw*) true;;
+               *) false;;
+             esac
+           }; then
+          gl_threads_api=win32
+          AC_DEFINE([USE_WIN32_THREADS], 1,
+            [Define if the Win32 multithreading API can be used.])
+        fi
+      fi
+    fi
+  fi
+  AC_MSG_CHECKING([for multithread API to use])
+  AC_MSG_RESULT([$gl_threads_api])
+  AC_SUBST(LIBTHREAD)
+  AC_SUBST(LTLIBTHREAD)
+  AC_SUBST(LIBMULTITHREAD)
+  AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_LOCK_EARLY])
+  AC_REQUIRE([gl_LOCK_BODY])
+  gl_PREREQ_LOCK
+])
+
+# Prerequisites of lib/lock.c.
+AC_DEFUN([gl_PREREQ_LOCK], [
+  AC_REQUIRE([AC_C_INLINE])
+])
+
+dnl Survey of platforms:
+dnl
+dnl Platform          Available   Compiler    Supports   test-lock
+dnl                   flavours    option      weak       result
+dnl ---------------   ---------   ---------   --------   ---------
+dnl Linux 2.4/glibc   posix       -lpthread       Y      OK
+dnl
+dnl GNU Hurd/glibc    posix
+dnl
+dnl FreeBSD 5.3       posix       -lc_r           Y
+dnl                   posix       -lkse ?         Y
+dnl                   posix       -lpthread ?     Y
+dnl                   posix       -lthr           Y
+dnl
+dnl FreeBSD 5.2       posix       -lc_r           Y
+dnl                   posix       -lkse           Y
+dnl                   posix       -lthr           Y
+dnl
+dnl FreeBSD 4.0,4.10  posix       -lc_r           Y      OK
+dnl
+dnl NetBSD 1.6        --
+dnl
+dnl OpenBSD 3.4       posix       -lpthread       Y      OK
+dnl
+dnl MacOS X 10.[123]  posix       -lpthread       Y      OK
+dnl
+dnl Solaris 7,8,9     posix       -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
+dnl                   solaris     -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
+dnl
+dnl HP-UX 11          posix       -lpthread       N (cc) OK
+dnl                                               Y (gcc)
+dnl
+dnl IRIX 6.5          posix       -lpthread       Y      0.5
+dnl
+dnl AIX 4.3,5.1       posix       -lpthread       N      AIX 4: 0.5; AIX 5: OK
+dnl
+dnl OSF/1 4.0,5.1     posix       -pthread (cc)   N      OK
+dnl                               -lpthread (gcc) Y
+dnl
+dnl Cygwin            posix       -lpthread       Y      OK
+dnl
+dnl Any of the above  pth         -lpth                  0.0
+dnl
+dnl Mingw             win32                       N      OK
+dnl
+dnl BeOS 5            --
+dnl
+dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
+dnl turned off:
+dnl   OK if all three tests terminate OK,
+dnl   0.5 if the first test terminates OK but the second one loops endlessly,
+dnl   0.0 if the first test already loops endlessly.
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
new file mode 100644
index 0000000..25590f4
--- /dev/null
+++ b/m4/longdouble.m4
@@ -0,0 +1,31 @@
+# longdouble.m4 serial 2 (gettext-0.15)
+dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
+dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
new file mode 100644
index 0000000..3716c09
--- /dev/null
+++ b/m4/longlong.m4
@@ -0,0 +1,48 @@
+# longlong.m4 serial 8
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
+
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[long long int ll = 9223372036854775807ll;
+	    long long int nll = -9223372036854775807LL;
+	    typedef int a[((-9223372036854775807LL < 0
+			    && 0 < 9223372036854775807ll)
+			   ? 1 : -1)];
+	    int i = 63;]],
+	  [[long long int llmax = 9223372036854775807ll;
+	    return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+		    | (llmax / ll) | (llmax % ll));]])],
+       [ac_cv_type_long_long_int=yes],
+       [ac_cv_type_long_long_int=no])])
+  if test $ac_cv_type_long_long_int = yes; then
+    AC_DEFINE([HAVE_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `long long int'.])
+  fi
+])
+
+# This macro is obsolescent and should go away soon.
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
+[
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  ac_cv_type_long_long=$ac_cv_type_long_long_int
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])
diff --git a/m4/nls.m4 b/m4/nls.m4
new file mode 100644
index 0000000..7967cc2
--- /dev/null
+++ b/m4/nls.m4
@@ -0,0 +1,31 @@
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
diff --git a/m4/po.m4 b/m4/po.m4
new file mode 100644
index 0000000..00133ef
--- /dev/null
+++ b/m4/po.m4
@@ -0,0 +1,428 @@
+# po.m4 serial 13 (gettext-0.15)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
new file mode 100644
index 0000000..af10170
--- /dev/null
+++ b/m4/printf-posix.m4
@@ -0,0 +1,44 @@
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+   dollar expansion (possibly an autoconf bug).  */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+  sprintf (buf, format, 33, 55);
+  return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 443c8e3..a56365c 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,10 +1,8 @@
-# progtest.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -18,36 +16,71 @@ dnl They are *not* in the public domain.
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
+AC_PREREQ(2.50)
+
 # Search path for a program which passes the given test.
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
 AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
 ])dnl
-  ;;
+    ;;
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
diff --git a/m4/size_max.m4 b/m4/size_max.m4
new file mode 100644
index 0000000..bfba811
--- /dev/null
+++ b/m4/size_max.m4
@@ -0,0 +1,62 @@
+# size_max.m4 serial 5
+dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  AC_CACHE_VAL([gl_cv_size_max], [
+    gl_cv_size_max=
+    AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], gl_cv_size_max=yes)
+    if test -z "$gl_cv_size_max"; then
+      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+      dnl than the type 'unsigned long'. Try hard to find a definition that can
+      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
+      _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
+        [#include <stddef.h>
+#include <limits.h>], size_t_bits_minus_1=)
+      _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+        [#include <stddef.h>], fits_in_uint=)
+      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
+        if test $fits_in_uint = 1; then
+          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+          AC_TRY_COMPILE([#include <stddef.h>
+            extern size_t foo;
+            extern unsigned long foo;
+            ], [], fits_in_uint=0)
+        fi
+        dnl We cannot use 'expr' to simplify this expression, because 'expr'
+        dnl works only with 'long' integers in the host environment, while we
+        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
+        if test $fits_in_uint = 1; then
+          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        else
+          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
+        fi
+      else
+        dnl Shouldn't happen, but who knows...
+        gl_cv_size_max='((size_t)~(size_t)0)'
+      fi
+    fi
+  ])
+  AC_MSG_RESULT([$gl_cv_size_max])
+  if test "$gl_cv_size_max" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 4b5a4ac..db9a8ac 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,28 +1,26 @@
-# stdint_h.m4 serial 2 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# stdint_h.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
 [
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
+  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
+    [uintmax_t i = (uintmax_t) -1; return !i;],
+    gl_cv_header_stdint_h=yes,
+    gl_cv_header_stdint_h=no)])
+  if test $gl_cv_header_stdint_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
   fi
 ])
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index 625171b..164aa8f 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="27 Apr 2008"
+RELEASE_DATE="19 Oct 2008"
 AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
 AC_SUBST(RELEASE_DATE)])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index ec3a8b9..bf83ed7 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,29 +1,30 @@
-# uintmax_t.m4 serial 6 (gettext-0.11)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# uintmax_t.m4 serial 9
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
 AC_PREREQ(2.13)
 
-# Define uintmax_t to `unsigned long' or `unsigned long long'
-# if <inttypes.h> does not exist.
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
 
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
     test $ac_cv_type_unsigned_long_long = yes \
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'
     AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-  [Define to unsigned long or unsigned long long
-   if <inttypes.h> and <stdint.h> don't define.])
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
   fi
 ])
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index c375e47..9fae98e 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,23 +1,48 @@
-# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# ulonglong.m4 serial 6
+dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Paul Eggert.
 
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.60, but can be removed once we
+# assume 2.61 everywhere.
+
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+	  [[unsigned long long int ull = 18446744073709551615ULL;
+	    typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
+			   ? 1 : -1)];
+	   int i = 63;]],
+	  [[unsigned long long int ullmax = 18446744073709551615ull;
+	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
+		    | ullmax / ull | ullmax % ull);]])],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `unsigned long long int'.])
+  fi
+])
+
+# This macro is obsolescent and should go away soon.
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
 [
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
   if test $ac_cv_type_unsigned_long_long = yes; then
     AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the unsigned long long type.])
+      [Define if you have the 'unsigned long long' type.])
   fi
 ])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
new file mode 100644
index 0000000..2ff6330
--- /dev/null
+++ b/m4/visibility.m4
@@ -0,0 +1,52 @@
+# visibility.m4 serial 1 (gettext-0.15)
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl MacOS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    AC_MSG_CHECKING([for simple visibility declarations])
+    AC_CACHE_VAL(gl_cv_cc_visibility, [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      AC_TRY_COMPILE(
+        [extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);],
+        [],
+        gl_cv_cc_visibility=yes,
+        gl_cv_cc_visibility=no)
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_visibility])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
new file mode 100644
index 0000000..cde2129
--- /dev/null
+++ b/m4/wchar_t.m4
@@ -0,0 +1,20 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
new file mode 100644
index 0000000..b8fff9c
--- /dev/null
+++ b/m4/wint_t.m4
@@ -0,0 +1,20 @@
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])
diff --git a/m4/xsize.m4 b/m4/xsize.m4
new file mode 100644
index 0000000..85bb721
--- /dev/null
+++ b/m4/xsize.m4
@@ -0,0 +1,13 @@
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS(stdint.h)
+])
diff --git a/man/Makefile.in b/man/Makefile.in
index 1315e57..38aa854 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,7 +45,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -94,6 +95,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -114,6 +116,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -146,6 +149,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -166,9 +170,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -195,6 +200,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
diff --git a/man/cups-genppd.8.in b/man/cups-genppd.8.in
index 51bfc42..e2d8070 100644
--- a/man/cups-genppd.8.in
+++ b/man/cups-genppd.8.in
@@ -1,4 +1,4 @@
-.\" $Id: cups-genppd.8.in,v 1.5 2004/09/17 18:38:02 rleigh Exp $
+.\" $Id: cups-genppd.8.in,v 1.6 2008/09/17 02:35:48 mbroughtn Exp $
 .\" Copyright (C) 2000-2004 Roger Leigh <rleigh@debian.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -45,7 +45,7 @@ are commands to find out what printer models and languages are
 supported.
 .SH EXAMPLES
 .TP
-.B cups\-genppd \-v bjc\-6200 'EPSON Stylus Photo 1280' 'HP DeskJet 850C'
+.B cups\-genppd \-v bjc\-6200 'Epson Stylus Photo 1280' 'HP DeskJet 850C'
 verbosely generate three PPD files, listing the driver name in the
 first case, and the full name in the second.
 .TP
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ada8bb4..5022b8b 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -7,9 +7,12 @@
 # functionality.
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.16
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -20,18 +23,38 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -42,9 +65,9 @@ POFILES = @POFILES@
 GMOFILES = @GMOFILES@
 UPDATEPOFILES = @UPDATEPOFILES@
 DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
@@ -55,7 +78,7 @@ CATALOGS = @CATALOGS@
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
 	@echo "$(MSGFMT) -c -o $@ $<"; \
@@ -74,18 +97,49 @@ CATALOGS = @CATALOGS@
 
 all: all-@USE_NLS@
 
-all-yes: $(CATALOGS)
+all-yes: stamp-po
 all-no:
 
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
 # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
 # otherwise packages like GCC can not be built if only parts of the source
 # have been downloaded.
 
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
 	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
 	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
 	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)'
+	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	  --msgid-bugs-address="$$msgid_bugs_address"
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -101,37 +155,49 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	  fi; \
 	}
 
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
 $(srcdir)/$(DOMAIN).pot:
 	$(MAKE) $(DOMAIN).pot-update
 
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
 $(POFILES): $(srcdir)/$(DOMAIN).pot
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
 
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  for file in $(DISTFILES.common); do \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
 	else \
 	  : ; \
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -170,20 +236,20 @@ install-strip: install
 installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
 	    if test -n "$$lc"; then \
 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -215,8 +281,8 @@ installcheck:
 uninstall: uninstall-exec uninstall-data
 uninstall-exec:
 uninstall-data: uninstall-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in $(DISTFILES.common); do \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
@@ -235,10 +301,11 @@ uninstall-data-yes:
 
 check: all
 
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
 mostlyclean:
 	rm -f remove-potcdate.sed
+	rm -f stamp-poT
 	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 	rm -fr *.o
 
@@ -250,35 +317,55 @@ distclean: clean
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
+	rm -f stamp-po $(GMOFILES)
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
-	if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
 	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
 	  if test -f $$file; then \
-	    cp -p $$file $(distdir); \
+	    cp -p $$file $(distdir) || exit 1; \
 	  else \
-	    cp -p $(srcdir)/$$file $(distdir); \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
 	  fi; \
 	done
 
 update-po: Makefile
 	$(MAKE) $(DOMAIN).pot-update
-	$(MAKE) $(UPDATEPOFILES)
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
 	$(MAKE) update-gmo
 
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
 # General rule for updating PO files.
 
 .nop.po-update:
 	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
@@ -305,10 +392,9 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
 
 force:
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b794d85..4eea9d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,14 +42,11 @@ src/main/print-vars.c
 src/main/print-weave.c
 src/main/string-list.c
 src/main/escp2-driver.c
-src/main/escp2-inks.c
 src/main/escp2-channels.c
 src/main/escp2-papers.c
 src/main/escp2-resolutions.c
 src/main/xml.c
 src/main/generic-options.c
-# Extracted XML translatable strings
-src/main/xmli18n-tmp.h
 src/main/util.h
 src/main/print-escp2.h
 src/main/generic-options.h
@@ -80,3 +77,5 @@ src/foomatic/printer_options.c
 # Ghostscript IJS driver
 src/ghost/ijsgutenprint.c
 
+# Extracted XML translatable strings
+src/xml/xmli18n-tmp.h
diff --git a/po/Rules-quot b/po/Rules-quot
index 5f46d23..9c2a995 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -4,6 +4,11 @@ DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.heade
 
 .SUFFIXES: .insert-header .po-update-en
 
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
 en@quot.po-update: en@quot.po-update-en
 en@boldquot.po-update: en@boldquot.po-update-en
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 57cc043..0d9a9c7 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 416a16b..cc1f7e1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.6-pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2003-05-03 19:43+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -95,18 +95,19 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -157,9 +158,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Velikost"
@@ -168,320 +169,367 @@ msgstr "Velikost"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Název tiskárny:"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Velikost papíru, na který chcete tisknout"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupní otvor) média, na které tisknete"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Upravit tisk na velikost stránky"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Rozlišení"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ inkoustu"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ inkoustu v tiskárně"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 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:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papír ColorLife"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+#, fuzzy
+msgid "Print Quality"
+msgstr "720 DPI Nejvyšší kvalita"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Světle fialová"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastní"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Černobíle"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Ru�ní"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standardní"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -516,9 +564,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
@@ -535,11 +582,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -605,7 +652,7 @@ msgid "Output image type"
 msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -673,16 +720,56 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Modrozelená"
 
@@ -691,16 +778,56 @@ msgstr "Modrozelená"
 msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -709,16 +836,56 @@ msgstr "Fialová"
 msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Žlutá"
 
@@ -727,9 +894,11 @@ msgstr "Žlutá"
 msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -738,7 +907,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -747,9 +916,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -759,16 +929,54 @@ msgid "Adjust the blue gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Černá"
 
@@ -777,7 +985,7 @@ msgstr "Černá"
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -792,7 +1000,7 @@ msgstr "Odstíny šedi"
 msgid "Adjust the cyan gray balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Fialová"
@@ -802,7 +1010,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Žlutá"
@@ -834,10 +1042,11 @@ msgstr "Typ inkoustu"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -845,27 +1054,27 @@ msgstr ""
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1011,504 +1220,568 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s není platný parametr typu %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznámá tiskárna %s\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s mimo rozsah (hodnota %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Velikost obrázku není platná\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Horní okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Levý okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Levý okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horní okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
-msgid "Print Quality"
-msgstr "720 DPI Nejvyšší kvalita"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ inkoustu"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Zrušit"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Modrozelená"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Fialová"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Žlutá"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Černobíle"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Modrozelená"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Upravit vyrovnání žluté tisku"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Hustota:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Upravit vyrovnání žluté tisku"
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Odstíny šedi"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Odstíny šedi"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Odstíny šedi"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:1999
-msgid "Full Manual Control"
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
+msgid "Paper Thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:800
 #, fuzzy
-msgid "Manual Control"
-msgstr "Ru�ní"
+msgid "Set printer paper thickness"
+msgstr "Nastavit implicitní"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standardní"
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Hustota:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
+#, fuzzy
+msgid "Print Method"
+msgstr "Model tiskárny:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Normální papír"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+msgid "Full Manual Control"
+msgstr ""
+
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1561,129 +1834,356 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Čtyři barvy standardní"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Tři barvy kompozitní"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Å est barev foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Normální papír"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Lesklý potah"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Fólie"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny ve foto kvalitě"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Jiný"
 
@@ -1699,177 +2199,202 @@ msgstr "Ru�ní s přestávkou"
 msgid "Manual without Pause"
 msgstr "Ru�ní bez přestávky"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý potah"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papír"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Černobíle"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Normální"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Prémiový"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Lesklý foto"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Fólie"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Rychleschnoucí foto"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Rychleschnoucí fólie"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Ru�ní"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Podava� 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Podava� 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Podava� 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Podava� 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Přenosný podava� papíru"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Podava� papíru na stole"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Podava�"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Nepovinný zdroj"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Automaticky vybrat"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI �ernobíle"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Výška:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografie"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Barevná a �erná cartridge"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Barevná a foto cartridge"
 
@@ -1878,6660 +2403,10151 @@ msgstr "Barevná a foto cartridge"
 msgid "PPDFile"
 msgstr "Soubor PPD:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "Soubor PPD?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Zrušit"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Vlastní"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Dva úrovně stupňů šedi"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-#, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Dva úrovně stupňů šedi"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Four Color Photo"
+msgid "Ultra Photo"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Šet barev rozšířené kompozitní"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Sedm barev foto"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr ""
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Sedm barev rozšířené"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:49
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Å est barev foto"
+msgid "Photograph"
+msgstr "Fotografie"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Čárová grafika"
+
+#: src/main/generic-options.c:55
+#, fuzzy
+msgid "Page"
+msgstr "Velikost"
+
+#: src/main/generic-options.c:56
+msgid "Job"
 msgstr ""
 
-#: src/main/escp2-channels.c:1914
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Sedm barev rozšířené"
+msgid "Image Type"
+msgstr "Typ obrázku:"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
+#: src/main/generic-options.c:69
+#, fuzzy
+msgid "Type of image being printed"
+msgstr "Typ inkoustu v tiskárně"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
 msgstr ""
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Tři barvy kompozitní"
+msgid "Page Number"
+msgstr "Velikost"
 
-#: src/main/escp2-channels.c:1981
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Tři barvy kompozitní"
+msgid "Page number"
+msgstr "Velikost"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/curve.c:130
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Čtyři barvy standardní"
+msgid "Curve type"
+msgstr "Černá"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Palec"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Nastavit základní jednotku měření na palce"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "Čtyři barvy standardní"
+msgid "Points"
+msgstr "Vytisknout"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
+#: src/gutenprintui2/panel.c:280
+#, fuzzy
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Nastavit základní jednotku měření na palce"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
 msgstr ""
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Å est barev foto"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Nastavit základní jednotku měření na centimetry"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Šet barev rozšířené kompozitní"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Nastavit základní jednotku měření na palce"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Barevný výstup"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Tisknout v odstínech šedi pomocí �erného inkoustu"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Sedm barev foto"
+msgid "Standard Command"
+msgstr "Standardní"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sedm barev rozšířené"
+msgid "Custom Command"
+msgstr "Příkaz:"
+
+#: 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 "Soubor"
 
-#: src/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Å est barev foto"
+msgid "Print to a file"
+msgstr "Tisknout do souboru?"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Å est barev foto"
+msgid "Set Default"
+msgstr "Nastavit implicitní"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr "Budiž"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/gutenprintui2/panel.c:642
+#, fuzzy
+msgid "Select File..."
+msgstr "Nastavit tiskárnu..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Tisk v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "O programu"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Vytisknout a\n"
+"uložit nastavení"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Uložit\n"
+"nastavení"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Vytisknout"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Náhled"
+
+#: 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 ""
+"Umístěte obrázek na obrazovce.\n"
+"Klikněte a táhněte primárním tla�ítkem pro umístění obrázku.\n"
+"Klikněte a táhněte druhým tla�ítkem pro posun obrázku s větší přesností; "
+"každá jednotka pohybu posune obrázek o jeden bod (1/72\")\n"
+"Klikněte a táhněte třetím (prostředním) tla�ítkem pro posun obrázku v "
+"jednotkách velikosti obrázku.\n"
+"Stisknutí klávesy shift při tažení omezuje obrázek na jen horizontální nebo "
+"vertikální pohyb.\n"
+"Pokud při tažení myší klikněte jiným tla�ítkem, obrázek se vrátí na svou "
+"původní pozici."
+
+#: 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 "Rozměry:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Šířka:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Šířka papíru, na který chcete tisknout"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Výška:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Výška papíru, na který chcete tisknout"
+
+#: 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
+#, fuzzy
+msgid "Image Position"
+msgstr "Pozice"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automaticky"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Na výšku"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Na šířku"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Vzhůru nohama"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Na stranu"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na "
+"šířku vzhůru nohama)"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientace:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Levý:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Vzdálenost od levého okraje papíru k obrázku"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Pravý:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Vzdálenost od levého okraje papíru k pravému okraji obrázku"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Vzdálenost od pravého okraje papíru k obrázku"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Horní:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Vzdálenost od horního okraje papíru k obrázku"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Spodní:"
+
+#: src/gutenprintui2/panel.c:1696
+#, fuzzy
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Vzdálenost od horního okraje papíru k spodnímu okraji obrázku"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Vzdálenost od spodního okraje papíru k obrázku"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Vycentrovat:"
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "Horizontálně"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Vycentrovat obrázek na papíře horizontálně"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Obojí"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Vycentrovat obrázek na papíře"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "Vertikálně"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Vycentrovat obrázek na papíře vertikálně"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Nastavit tiskárnu"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "Název tiskárny:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "Vyberte model své tiskárny"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Model tiskárny:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Vyberte model své tiskárny"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "Soubor PPD:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Procházet"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Zvolte správný název souboru PPD pro svou tiskárnu"
+
+#: 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 ""
+"Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
+"tisknout"
+
+#: src/gutenprintui2/panel.c:1914
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "Název tiskárny:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "testovací tisk"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "Tisknout do souboru?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definovat novou tiskárnu"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Název tiskárny:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Zadejte název, který chcete dát této logické tiskárně"
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "O Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Verze Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Nastavení tiskárny"
+
+#: 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 ""
+"Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
+"tisknout"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Nastavit tiskárnu..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Zvolte model tiskárny, soubor PPD a příkaz, který se používá pro tisk na "
+"tuto tiskárnu"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Nová tiskárna..."
+
+#: 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 ""
+"Definovat novou logickou tiskárnu. Toto může být použito pro pojmenování "
+"sady nastavení, které si chcete zapamatovat pro budoucí použití."
+
+#: src/gutenprintui2/panel.c:2150
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Nastavit implicitní"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Typ obrázku"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Měřítko:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Nastavte měřítko (velikost) obrázku"
+
+#: 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 ""
+"Vyberte, jestli je měřítko měřeno jako procenta dostupné velikosti stránky "
+"nebo po�et výstupních bodů na palec"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Procenta"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Upravit tisk na velikost stránky"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Upravit tisk na po�et bodů na palec"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Nastavit šířku tisku"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Nastavit výšku tisku"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Použít původní\n"
+"velikost obrázku"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Nastavit velikost tisku na velikost obrázku"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Úprava barvy tisku"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Nastavit implicitní"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Náhled obrázku"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Typ výstupu:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Typ výstupu:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Zvolte požadovaný typ výstupu"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Upravit výstup..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr "Upravit vyrovnání barev, jask, kontrast, sytost a algoritmus rozkladu"
+
+#: src/gutenprintui2/panel.c:2523
+#, fuzzy
+msgid "Size Units:"
+msgstr "Jednotky:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+msgid " "
+msgstr "> "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Jednotky:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Vyberte základní jednotku měření pro tisk"
+
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Vytisknout"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Nastavit tiskárnu"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Název tiskárny:"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr ""
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Příkaz:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "Podava� 1"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "Podava� 2"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "Podava� 3"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "Podava� 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Czech"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Velikost média:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Barva"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Odstíny šedi"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Barva"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "Barvy CMY"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Verze escputil "
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Tento program je free software; můžete jej dále šířit a/nebo modifikovat\n"
+"za podmínek GNU General Public License publikované Free Software\n"
+"Foundation; a to bu� verze 2 licence, nebo (podle vašeho uvážení)\n"
+"libovolné pozdější verze.\n"
+"\n"
+"Tento program je rozšiřován v naději, že bude, užite�ný, ale BEZ JAKÉKOLI\n"
+"Z�RUKY; ani bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO NĚJAK�\n"
+"KONKRÉTN� ÚČEL. Pro další podrobnosti si pře�těte GNU General Public\n"
+"License.\n"
+"\n"
+"Kopii GNU General Public License jste měli dostat s tímto programem;\n"
+"pokud se tak nestalo, napište Free Software Foundation, Inc., 59 Temple\n"
+"Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\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 ""
+"Použití: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P tiskárna | -r zařízení] [-u] [-q] [-m model]\n"
+"Provádět údržbu tiskáren EPSON Stylus (R).\n"
+"Příklady: escputil --clean-head --printer stpex-na-třetím-poschodí\n"
+"          escputil --ink-level --new --raw-device /dev/lp0\n"
+"\n"
+"  Příkazy:\n"
+"    -c|--clean-head    Vy�istit tiskovou hlavu.\n"
+"    -n|--nozzle-check  Vytisknout vzorek testu trysek.\n"
+"                       Špinavé nebo ucpané trysky se projeví jako mezery\n"
+"                       ve vzorku. Pokud uvidíte mezery, měli byste vy�istit\n"
+"                       tiskovou hlavu.\n"
+"    -a|--align-head    Zarovnat tiskovou hlavu. POZOR: Zneužití tohoto\n"
+"                       nástroje může vést ke špatné kvalitě tisku a/nebo\n"
+"                       poškození tiskárny.\n"
+"    -o|--align-color   Zarovnat barevnou tiskovou halvu (jen Stylus Color "
+"480\n"
+"                       a 580). POZOR: Zneužití tohoto nástroje může vést\n"
+"                       ke špatné kvalitě tisku a/nebo poškození tiskárny.\n"
+"    -s|--status        Získat stav tiskárny.\n"
+"    -i|--ink-level     Získat od tiskárny hladinu inkoustu. Toto vyžaduje\n"
+"                       přímý přístup k zařízení tiskárny pro �tení i zápis.\n"
+"    -d|--identify      Zeptat se tiskárny na informace o zna�te a modelu.\n"
+"                       Toto vyžaduje přímý přístup k zařízení tiskárny pro\n"
+"                       �tení i zápis.\n"
+"    -l|--license       Zobrazit podmínky licence/záruky tohoto programu.\n"
+"    -M|--list-models   Vypsat dostupné modely tiskáren.\n"
+"    -h|--help          Vypsat tuto zprávu nápovědy.\n"
+"  Přepína�e:\n"
+"    -P|--printer-name  Ur�uje název tiskové fronty, na které pracovat.\n"
+"                       Implicitní je implicitní tiskárna systému.\n"
+"    -r|--raw-device    Ur�ení zařízení, na které zapisovat přímo místo\n"
+"                       prostřednictvím tiskové fronty.\n"
+"    -u|--new           Tiskárna je nová tiskárna (Stylus Color 740 nebo\n"
+"                       novější).\n"
+"    -q|--quiet         Potla�it hlavi�ku.\n"
+"    -m|--model         Ur�ení přesného modelu pro zarovnání hlav.\n"
+
+#: src/escputil/escputil.c:162
+#, fuzzy
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\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 ""
+"Použití: escputil [PŘEP�NAČE] [PŘ�KAZ]\n"
+"Použití: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P tiskárna | -r zařízení] [-u] [-q] [-m model]\n"
+"Provádět údržbu tiskáren EPSON Stylus (R).\n"
+"Příklady: escputil -c -P stpex-na-třetím-poschodí\n"
+"          escputil -i -u -r /dev/lp0\n"
+"\n"
+"  Příkazy:\n"
+"    -c Vy�istit tiskovou hlavu.\n"
+"    -n Vytisknout vzorek testu trysek.\n"
+"          Špinavé nebo ucpané trysky se projeví jako mezery\n"
+"          ve vzorku. Pokud uvidíte mezery, měli byste vy�istit\n"
+"          tiskovou hlavu.\n"
+"    -a Zarovnat tiskovou hlavu. POZOR: Zneužití tohoto\n"
+"          nástroje může vést ke špatné kvalitě tisku a/nebo\n"
+"          poškození tiskárny.\n"
+"    -o Zarovnat barevnou tiskovou halvu (jen Stylus Color 480\n"
+"          a 580). POZOR: Zneužití tohoto nástroje může vést\n"
+"          ke špatné kvalitě tisku a/nebo poškození tiskárny.\n"
+"    -s Získat stav tiskárny.\n"
+"    -i Získat od tiskárny hladinu inkoustu. Toto vyžaduje\n"
+"          přímý přístup k zařízení tiskárny pro �tení i zápis.\n"
+"    -d Zeptat se tiskárny na informace o zna�te a modelu.\n"
+"          Toto vyžaduje přímý přístup k zařízení tiskárny pro\n"
+"          �tení i zápis.\n"
+"    -l Zobrazit podmínky licence/záruky tohoto programu.\n"
+"    -M Vypsat dostupné modely tiskáren.\n"
+"    -h Vypsat tuto zprávu nápovědy.\n"
+"  Přepína�e:\n"
+"    -P Ur�uje název tiskové fronty, na které pracovat.\n"
+"          Implicitní je implicitní tiskárna systému.\n"
+"    -r Ur�ení zařízení, na které zapisovat přímo místo\n"
+"          prostřednictvím tiskové fronty.\n"
+"    -u Tiskárna je nová tiskárna (Stylus Color 740 nebo novější).\n"
+"    -q Potla�it hlavi�ku.\n"
+"    -m Ur�ení přesného modelu pro zarovnání hlav.\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Můžete zadat jen jednu tiskárnu nebo přímé zařízení."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Můžete zadat jen jeden model tiskárny."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Neznámý přepína� %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Nemohu otevřít zařízení %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Nemohu odeslat příkaz tiskárně\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Nemohu �íst z %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Nemohu otevřít %s pro �tení i zápis: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Neznámý přepína� %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Nemohu zapisovat do %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Nemohu zapisovat do %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Nemohu detekovat typ tiskárny.\n"
+"Použijte prosím -m pro ur�ení modelu své tiskárny.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapír"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "Matný papír"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Světle modrozelená"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Světle fialová"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "Černá/tmavá žlutá"
+msgid "Matte Black"
+msgstr "Matný papír"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Černá"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Rychlé podávání normálního papíru"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Velikost"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Sytost:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Chyba ve vstupu\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Chyba ve vstupu\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Chyba ve vstupu\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Barva inkoustu"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Zbývá procent"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Název tiskárny:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Můžete zadat jen jeden model tiskárny."
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Čistím hlavy...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Před pokra�ováním si prosím velice pozorně pře�těte si tyto instrukce.\n"
+"\n"
+"Tento nástroj vám umožňuje zarovnat tiskovou hlavu vaší inkoustové\n"
+"tiskárny Epson Stylus. Zneužití tohoto nástroje může způsobit zhoršení\n"
+"kvality tisku a možná poškodit vaši tiskárnu. Správnost tohoto nástroje\n"
+"nebyla zkontrolována v Seiko Epson a tento nástroj je nabízen úplně bez\n"
+"záruky. Celé riziko používání tohoto nástroje je na vás.\n"
+"\n"
+"Tento nástroj vytiskne %d testovacích vzorků. Všechny vzorky vypadají "
+"velice\n"
+"podobně. Vzorky sestávají ze sérií dvojic vertikálních �ar, které se\n"
+"překrývají. Pod každou dvojicí �ar je �íslo mezi %d a %d.\n"
+"\n"
+"Když budete zkoumat dvojice �ar, měli byste najít dvojici, která je nejlépe\n"
+"zarovnaná, to je nejlépe tvoří jedinou vertikální �áru. Zkoumejte\n"
+"dvojice velice pe�livě, abyste nalezli nejlepší odpově�. Pro kritické\n"
+"zkoumání se doporu�uje použití lupy nebo zvětšovacího skla. Také\n"
+"se doporu�uje použít pro test kvalitní papír, aby byly �áry zřetelné\n"
+"a neroztékaly se po papíru. Po vybrání �ísla odpovídajícího nejlepšímu\n"
+"páru vlože papír zpět do podava�e, než �íslo zadáte.\n"
+"\n"
+"Všechny vzorky jsou podobné, ale pozdější vzorky používají menší body\n"
+"pro kriti�tější zarovnání. Pro správné zarovnání vaší tiskárny musíte\n"
+"projít všemi průchody. Po zpracování všech průchodů zarovnání budou\n"
+"vzorky zarovnání vytištěny ještě jednou. Měli byste zjistit, že\n"
+"nejprostřednější dvojice (#%d z %d) je nejlepší ze všech vzorků.\n"
+"\n"
+"Až budou vzorky vytištěny ještě jednou, bude vám nabídnuto uložit\n"
+"výsledky v tiskárně (s), opakování procesu (r) nebo ukon�ení bez\n"
+"uložení (q). Ukon�ení neobnoví předchozí nastavení, ale vypnutí\n"
+"a opětovné zapnutí tiskárny ano. Pokud skon�íte, musíte zopakovat\n"
+"celý proces, pokud byste chtěli později výsledky uložit. Je důležité,\n"
+"abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Před pokra�ováním si prosím velice pozorně pře�těte si tyto instrukce.\n"
+"\n"
+"Tento nástroj vám umožňuje zarovnat tiskovou hlavu vaší inkoustové\n"
+"tiskárny Epson Stylus. Zneužití tohoto nástroje může způsobit zhoršení\n"
+"kvality tisku a možná poškodit vaši tiskárnu. Správnost tohoto nástroje\n"
+"nebyla zkontrolována v Seiko Epson a tento nástroj je nabízen úplně bez\n"
+"záruky. Celé riziko používání tohoto nástroje je na vás.\n"
+"\n"
+"Tento nástroj vytiskne testovací vzorek, který sestávají ze sérií dvojic\n"
+"vertikálních �ar, které se překrývají. Pod každou dvojicí �ar je �íslo\n"
+"mezi %d a %d.\n"
+"\n"
+"Když budete zkoumat dvojice �ar, měli byste najít dvojici, která je nejlépe\n"
+"zarovnaná, to je nejlépe tvoří jedinou vertikální �áru. Zkoumejte\n"
+"dvojice velice pe�livě, abyste nalezli nejlepší odpově�. Pro kritické\n"
+"zkoumání se doporu�uje použití lupy nebo zvětšovacího skla. Také\n"
+"se doporu�uje použít pro test kvalitní papír, aby byly �áry zřetelné\n"
+"a neroztékaly se po papíru. Po vybrání �ísla odpovídajícího nejlepšímu\n"
+"páru vlože papír zpět do podava�e, než �íslo zadáte.\n"
+"\n"
+"Po zpracování vzorku zarovnání budou vzorky vytištěny ještě jednou.\n"
+"Měli byste zjistit, že nejprostřednější dvojice (#%d z %d) je nejlepší.\n"
+"Pak vám bude nabídnuto bude uložení výsledků v tiskárně (s), opakování\n"
+"procesu (r) nebo ukon�ení bez uložení (q). Ukon�ení neobnoví předchozí \n"
+"nastavení, ale vypnutí a opětovné zapnutí tiskárny ano. Pokud skon�íte,\n"
+"musíte zopakovat celý proces, pokud byste chtěli později výsledky uložit.\n"
+"Je důležité, abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Zkontrolujte prosím kone�ný výstup velice pozorně, abyste se ujistili,\n"
+"že vaše tiskárna je správně zarovnána. Nyní můžete:\n"
+"  (s) uložit výsledky do tiskárny,\n"
+"  (q) skon�it bez ukládání výsledků, nebo\n"
+"  (r) zopakovat celý proces od za�átku.\n"
+"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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+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:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+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:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Opakuji proces zarovnávání.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Toto trvale změní konfiguraci vaší tiskárny.\n"
+"VAROV�N�: tato procedura nebyla schválena Seiko Epson a může\n"
+"poškodit vaši tiskárnu. Pokra�ovat?\n"
+"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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Připravuji se uložit nastavení..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "selhalo!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
+"zarovnávání.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "uspělo!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Nerozpoznaný příkaz.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Poslední příkaz nebyl potvrzen.\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 ""
+"Tato procedura předpokládá, že vaše tiskárna je Epson %s.\n"
+"Pokud to není model vaší tiskárny, stiskněte nyní prosím control-C\n"
+"a zvolte váš skute�ný model tiskárny.\n"
+"\n"
+"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:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Pokra�ujte stisknutím enter > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Průchod #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, 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:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Číslo mimo rozsah!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Nemohu pochopit, co jste napsali!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Pokouším se nastavit zarovnání..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "uspělo.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Zkontrolujte prosím, že zarovnání je správné. Až bude vzorek zarovnání\n"
+"znovu vytištěn, přesvěd�te se prosím, že nejlepší vzorek v každém řádku je\n"
+"vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
+"zopakovat.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Chyba ve vstupu\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Tisknu..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Matný papír"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Pohlednice"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Papír ColorLife"
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Lesklý fotopapír"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Matný papír"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Podávací válec"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr "Podávací válec (odříznout každou stranu)"
-
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr "Podávací válec (neodřezávat)"
+msgid "Premium Semigloss Photo Paper"
+msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Ru�ní"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "Tisknout do souboru?"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Ru�ní výběr"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Ru�ní"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Podava�"
+msgid "ColorLife Paper"
+msgstr "Papír ColorLife"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
 
-#: src/main/escp2-papers.c:1988
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotopapír"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Rychlé podávání normálního papíru"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr "Přihrádka řezaných listů 1"
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
-msgstr "Přihrádka řezaných listů 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr ""
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
-msgstr "Automatický výběr řezaných listů"
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+#, fuzzy
+msgid "UltraChrome Photo Black"
+msgstr "Å est barev foto"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
-msgstr "Ru�ní výběr"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600×600 DPI �ernobíle"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150×150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600×600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "600 DPI vysoká kvalita"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
 #, fuzzy
-msgid "720 DPI High Quality"
-msgstr "1200 DPI vysoká kvalita"
+msgid "360 x 120 DPI Economy"
+msgstr "600×600 DPI �ernobíle"
 
-#: src/main/escp2-resolutions.c:103
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 DPI Highest Quality"
-msgstr "1200 DPI nejvyšší kvalita"
+msgid "360 x 240 DPI Draft"
+msgstr "600×600 DPI"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "720 DPI High Quality"
+msgstr "1200 DPI vysoká kvalita"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
 #, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgid "720 DPI Highest Quality"
+msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "Černá/tmavá žlutá"
+
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "Název tiskárny:"
+msgid "Black 1"
+msgstr "Černá"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Černá"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1200 DPI nejvyšší kvalita"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Podava�"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Název tiskárny:"
+msgid "Manual Feed"
+msgstr "Ru�ní"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Jas:"
+msgid "Print to CD"
+msgstr "Tisknout do souboru?"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr "Podávací válec (odříznout každou stranu)"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
+msgstr "Podávací válec (neodřezávat)"
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Podávací válec"
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "High"
-msgstr "Výška:"
+msgid "Manual Sheet Guide"
+msgstr "Ru�ní výběr"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Photo"
-msgstr "Fotografie"
+msgid "Manual Feed (Front)"
+msgstr "Ru�ní"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3104
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Photo Board"
+msgstr "Fotopapír"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Å est barev foto"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr "Přihrádka řezaných listů 1"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr "Přihrádka řezaných listů 2"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
+msgstr "Automatický výběr řezaných listů"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr "Ru�ní výběr"
+
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+#, fuzzy
+msgid "Three Color Raw"
+msgstr "Tři barvy kompozitní"
+
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+#, fuzzy
+msgid "Four Color Raw"
+msgstr "Čtyři barvy standardní"
+
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
 #, fuzzy
-msgid "Photograph"
-msgstr "Fotografie"
+msgid "Six Color Raw"
+msgstr "Å est barev foto"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Čárová grafika"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+#, fuzzy
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Sedm barev rozšířené"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
 #, fuzzy
-msgid "Page"
-msgstr "Velikost"
+msgid "Three Color Raw Gloss"
+msgstr "Tři barvy kompozitní"
 
-#: src/main/generic-options.c:56
-msgid "Job"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "Čtyři barvy standardní"
+
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+#, fuzzy
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Šet barev rozšířené kompozitní"
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+#, fuzzy
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Sedm barev rozšířené"
+
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "Nastavit implicitní"
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Sedm barev foto"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Šet barev rozšířené kompozitní"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+#, fuzzy
+msgid "Seven Color Raw"
+msgstr "Sedm barev foto"
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Dva úrovně stupňů šedi"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
 #, fuzzy
-msgid "Image Type"
-msgstr "Typ obrázku:"
+msgid "Eight Color Photo"
+msgstr "Å est barev foto"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Typ inkoustu v tiskárně"
+msgid "Eight Color Raw"
+msgstr "Å est barev foto"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Å est barev foto"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Název tiskárny:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Velikost"
+msgid "Interleave 2"
+msgstr "Název tiskárny:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Velikost"
+msgid "Eight Pass"
+msgstr "Jas:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson fotopapír 4×6"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22×30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Na šířku"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "ArchA transposed"
 msgstr "ArchA pří�ně"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "ArchB transposed"
 msgstr "ArchB pří�ně"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "ArchC transposed"
 msgstr "ArchC pří�ně"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "ArchD transposed"
 msgstr "ArchD pří�ně"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 #, fuzzy
 msgid "ArchE transposed"
 msgstr "ArchE pří�ně"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Americký foolscap"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Evropský foolscap"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Malá brožura"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Malá brožura Penguin"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Velká brožura Penguin"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Karta Hagaki"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Karta Oufuku"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "Pozvánka A2"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Obálka Monarch"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Obálka Monarch"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohlednice"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Vlastní"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "Rolovaný papír 89 mm"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "Rolovaný papír 5 palců"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "Rolovaný papír 210 mm"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "Rolovaný papír 13 palců"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "Rolovaný papír 22 palce"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "Rolovaný papír 24 palce"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "Rolovaný papír 44 palce"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "Rolovaný papír 36 palců"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "Rolovaný papír 4 palce"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C42ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C42ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Název tiskárny:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Nastavit tiskárnu"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Černá"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Palec"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Nastavit základní jednotku měření na palce"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Nastavit základní jednotku měření na centimetry"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Vytisknout"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Nastavit základní jednotku měření na palce"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Nastavit základní jednotku měření na centimetry"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Nastavit základní jednotku měření na palce"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Barevný výstup"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Tisknout v odstínech šedi pomocí �erného inkoustu"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "Standardní"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Příkaz:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Soubor"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Tisknout do souboru?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Nastavit implicitní"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "Budiž"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Zrušit"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Nastavit tiskárnu..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Tisk v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "O programu"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Vytisknout a\n"
-"uložit nastavení"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"Uložit\n"
-"nastavení"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Vytisknout"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Náhled"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"Umístěte obrázek na obrazovce.\n"
-"Klikněte a táhněte primárním tla�ítkem pro umístění obrázku.\n"
-"Klikněte a táhněte druhým tla�ítkem pro posun obrázku s větší přesností; "
-"každá jednotka pohybu posune obrázek o jeden bod (1/72\")\n"
-"Klikněte a táhněte třetím (prostředním) tla�ítkem pro posun obrázku v "
-"jednotkách velikosti obrázku.\n"
-"Stisknutí klávesy shift při tažení omezuje obrázek na jen horizontální nebo "
-"vertikální pohyb.\n"
-"Pokud při tažení myší klikněte jiným tla�ítkem, obrázek se vrátí na svou "
-"původní pozici."
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Rozměry:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Šířka:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Šířka papíru, na který chcete tisknout"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Výška:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Výška papíru, na který chcete tisknout"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Pozice"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automaticky"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Na výšku"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Na šířku"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Vzhůru nohama"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Na stranu"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
-"Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na "
-"šířku vzhůru nohama)"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientace:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Levý:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Vzdálenost od levého okraje papíru k obrázku"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Pravý:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Vzdálenost od levého okraje papíru k pravému okraji obrázku"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Vzdálenost od pravého okraje papíru k obrázku"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Horní:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Vzdálenost od horního okraje papíru k obrázku"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Spodní:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Vzdálenost od horního okraje papíru k spodnímu okraji obrázku"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Vzdálenost od spodního okraje papíru k obrázku"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Vycentrovat:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Horizontálně"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Vycentrovat obrázek na papíře horizontálně"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Obojí"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Vycentrovat obrázek na papíře"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Vertikálně"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Vycentrovat obrázek na papíře vertikálně"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Nastavit tiskárnu"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Název tiskárny:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "Vyberte model své tiskárny"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Model tiskárny:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Vyberte model své tiskárny"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "Soubor PPD:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Procházet"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Zvolte správný název souboru PPD pro svou tiskárnu"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-#, fuzzy
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
-"Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
-"tisknout"
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Název tiskárny:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "testovací tisk"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Tisknout do souboru?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Definovat novou tiskárnu"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Název tiskárny:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Zadejte název, který chcete dát této logické tiskárně"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "O Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Verze Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Nastavení tiskárny"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
-"Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
-"tisknout"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Nastavit tiskárnu..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
-"Zvolte model tiskárny, soubor PPD a příkaz, který se používá pro tisk na "
-"tuto tiskárnu"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Nová tiskárna..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
-"Definovat novou logickou tiskárnu. Toto může být použito pro pojmenování "
-"sady nastavení, které si chcete zapamatovat pro budoucí použití."
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Nastavit implicitní"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Typ obrázku"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Měřítko:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Nastavte měřítko (velikost) obrázku"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
-"Vyberte, jestli je měřítko měřeno jako procenta dostupné velikosti stránky "
-"nebo po�et výstupních bodů na palec"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Procenta"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Upravit tisk na velikost stránky"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Upravit tisk na po�et bodů na palec"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Nastavit šířku tisku"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Nastavit výšku tisku"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"Použít původní\n"
-"velikost obrázku"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Nastavit velikost tisku na velikost obrázku"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Úprava barvy tisku"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Nastavit implicitní"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Zavřít"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Náhled obrázku"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Typ výstupu:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Typ výstupu:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Zvolte požadovaný typ výstupu"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Upravit výstup..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr "Upravit vyrovnání barev, jask, kontrast, sytost a algoritmus rozkladu"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Jednotky:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Jednotky:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Vyberte základní jednotku měření pro tisk"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Vytisknout"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Nastavit tiskárnu"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Název tiskárny:"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Příkaz:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "Podava� 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "Podava� 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "Podava� 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "Podava� 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Czech"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "UTF-8"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Verze escputil "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Tento program je free software; můžete jej dále šířit a/nebo modifikovat\n"
-"za podmínek GNU General Public License publikované Free Software\n"
-"Foundation; a to bu� verze 2 licence, nebo (podle vašeho uvážení)\n"
-"libovolné pozdější verze.\n"
-"\n"
-"Tento program je rozšiřován v naději, že bude, užite�ný, ale BEZ JAKÉKOLI\n"
-"Z�RUKY; ani bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO NĚJAK�\n"
-"KONKRÉTN� ÚČEL. Pro další podrobnosti si pře�těte GNU General Public\n"
-"License.\n"
-"\n"
-"Kopii GNU General Public License jste měli dostat s tímto programem;\n"
-"pokud se tak nestalo, napište Free Software Foundation, Inc., 59 Temple\n"
-"Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
-"Použití: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P tiskárna | -r zařízení] [-u] [-q] [-m model]\n"
-"Provádět údržbu tiskáren EPSON Stylus (R).\n"
-"Příklady: escputil --clean-head --printer stpex-na-třetím-poschodí\n"
-"          escputil --ink-level --new --raw-device /dev/lp0\n"
-"\n"
-"  Příkazy:\n"
-"    -c|--clean-head    Vy�istit tiskovou hlavu.\n"
-"    -n|--nozzle-check  Vytisknout vzorek testu trysek.\n"
-"                       Špinavé nebo ucpané trysky se projeví jako mezery\n"
-"                       ve vzorku. Pokud uvidíte mezery, měli byste vy�istit\n"
-"                       tiskovou hlavu.\n"
-"    -a|--align-head    Zarovnat tiskovou hlavu. POZOR: Zneužití tohoto\n"
-"                       nástroje může vést ke špatné kvalitě tisku a/nebo\n"
-"                       poškození tiskárny.\n"
-"    -o|--align-color   Zarovnat barevnou tiskovou halvu (jen Stylus Color "
-"480\n"
-"                       a 580). POZOR: Zneužití tohoto nástroje může vést\n"
-"                       ke špatné kvalitě tisku a/nebo poškození tiskárny.\n"
-"    -s|--status        Získat stav tiskárny.\n"
-"    -i|--ink-level     Získat od tiskárny hladinu inkoustu. Toto vyžaduje\n"
-"                       přímý přístup k zařízení tiskárny pro �tení i zápis.\n"
-"    -d|--identify      Zeptat se tiskárny na informace o zna�te a modelu.\n"
-"                       Toto vyžaduje přímý přístup k zařízení tiskárny pro\n"
-"                       �tení i zápis.\n"
-"    -l|--license       Zobrazit podmínky licence/záruky tohoto programu.\n"
-"    -M|--list-models   Vypsat dostupné modely tiskáren.\n"
-"    -h|--help          Vypsat tuto zprávu nápovědy.\n"
-"  Přepína�e:\n"
-"    -P|--printer-name  Ur�uje název tiskové fronty, na které pracovat.\n"
-"                       Implicitní je implicitní tiskárna systému.\n"
-"    -r|--raw-device    Ur�ení zařízení, na které zapisovat přímo místo\n"
-"                       prostřednictvím tiskové fronty.\n"
-"    -u|--new           Tiskárna je nová tiskárna (Stylus Color 740 nebo\n"
-"                       novější).\n"
-"    -q|--quiet         Potla�it hlavi�ku.\n"
-"    -m|--model         Ur�ení přesného modelu pro zarovnání hlav.\n"
 
-#: src/escputil/escputil.c:162
-#, fuzzy
-msgid ""
-"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
-"Použití: escputil [PŘEP�NAČE] [PŘ�KAZ]\n"
-"Použití: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P tiskárna | -r zařízení] [-u] [-q] [-m model]\n"
-"Provádět údržbu tiskáren EPSON Stylus (R).\n"
-"Příklady: escputil -c -P stpex-na-třetím-poschodí\n"
-"          escputil -i -u -r /dev/lp0\n"
-"\n"
-"  Příkazy:\n"
-"    -c Vy�istit tiskovou hlavu.\n"
-"    -n Vytisknout vzorek testu trysek.\n"
-"          Špinavé nebo ucpané trysky se projeví jako mezery\n"
-"          ve vzorku. Pokud uvidíte mezery, měli byste vy�istit\n"
-"          tiskovou hlavu.\n"
-"    -a Zarovnat tiskovou hlavu. POZOR: Zneužití tohoto\n"
-"          nástroje může vést ke špatné kvalitě tisku a/nebo\n"
-"          poškození tiskárny.\n"
-"    -o Zarovnat barevnou tiskovou halvu (jen Stylus Color 480\n"
-"          a 580). POZOR: Zneužití tohoto nástroje může vést\n"
-"          ke špatné kvalitě tisku a/nebo poškození tiskárny.\n"
-"    -s Získat stav tiskárny.\n"
-"    -i Získat od tiskárny hladinu inkoustu. Toto vyžaduje\n"
-"          přímý přístup k zařízení tiskárny pro �tení i zápis.\n"
-"    -d Zeptat se tiskárny na informace o zna�te a modelu.\n"
-"          Toto vyžaduje přímý přístup k zařízení tiskárny pro\n"
-"          �tení i zápis.\n"
-"    -l Zobrazit podmínky licence/záruky tohoto programu.\n"
-"    -M Vypsat dostupné modely tiskáren.\n"
-"    -h Vypsat tuto zprávu nápovědy.\n"
-"  Přepína�e:\n"
-"    -P Ur�uje název tiskové fronty, na které pracovat.\n"
-"          Implicitní je implicitní tiskárna systému.\n"
-"    -r Ur�ení zařízení, na které zapisovat přímo místo\n"
-"          prostřednictvím tiskové fronty.\n"
-"    -u Tiskárna je nová tiskárna (Stylus Color 740 nebo novější).\n"
-"    -q Potla�it hlavi�ku.\n"
-"    -m Ur�ení přesného modelu pro zarovnání hlav.\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Můžete zadat jen jednu tiskárnu nebo přímé zařízení."
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Můžete zadat jen jeden model tiskárny."
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Neznámý přepína� %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Nemohu otevřít zařízení %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Nemohu odeslat příkaz tiskárně\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Nemohu �íst z %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Nemohu otevřít %s pro �tení i zápis: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Neznámý přepína� %s\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Nemohu zapisovat do %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"Nemohu detekovat typ tiskárny.\n"
-"Použijte prosím -m pro ur�ení modelu své tiskárny.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Sytost:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "Chyba ve vstupu\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "Chyba ve vstupu\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Nastavit tiskárnu"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Barva inkoustu"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Zbývá procent"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Identifikace tiskárny vyžaduje použití přímého zařízení.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Můžete zadat jen jeden model tiskárny."
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Čistím hlavy...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, 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/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
-"Před pokra�ováním si prosím velice pozorně pře�těte si tyto instrukce.\n"
-"\n"
-"Tento nástroj vám umožňuje zarovnat tiskovou hlavu vaší inkoustové\n"
-"tiskárny Epson Stylus. Zneužití tohoto nástroje může způsobit zhoršení\n"
-"kvality tisku a možná poškodit vaši tiskárnu. Správnost tohoto nástroje\n"
-"nebyla zkontrolována v Seiko Epson a tento nástroj je nabízen úplně bez\n"
-"záruky. Celé riziko používání tohoto nástroje je na vás.\n"
-"\n"
-"Tento nástroj vytiskne %d testovacích vzorků. Všechny vzorky vypadají "
-"velice\n"
-"podobně. Vzorky sestávají ze sérií dvojic vertikálních �ar, které se\n"
-"překrývají. Pod každou dvojicí �ar je �íslo mezi %d a %d.\n"
-"\n"
-"Když budete zkoumat dvojice �ar, měli byste najít dvojici, která je nejlépe\n"
-"zarovnaná, to je nejlépe tvoří jedinou vertikální �áru. Zkoumejte\n"
-"dvojice velice pe�livě, abyste nalezli nejlepší odpově�. Pro kritické\n"
-"zkoumání se doporu�uje použití lupy nebo zvětšovacího skla. Také\n"
-"se doporu�uje použít pro test kvalitní papír, aby byly �áry zřetelné\n"
-"a neroztékaly se po papíru. Po vybrání �ísla odpovídajícího nejlepšímu\n"
-"páru vlože papír zpět do podava�e, než �íslo zadáte.\n"
-"\n"
-"Všechny vzorky jsou podobné, ale pozdější vzorky používají menší body\n"
-"pro kriti�tější zarovnání. Pro správné zarovnání vaší tiskárny musíte\n"
-"projít všemi průchody. Po zpracování všech průchodů zarovnání budou\n"
-"vzorky zarovnání vytištěny ještě jednou. Měli byste zjistit, že\n"
-"nejprostřednější dvojice (#%d z %d) je nejlepší ze všech vzorků.\n"
-"\n"
-"Až budou vzorky vytištěny ještě jednou, bude vám nabídnuto uložit\n"
-"výsledky v tiskárně (s), opakování procesu (r) nebo ukon�ení bez\n"
-"uložení (q). Ukon�ení neobnoví předchozí nastavení, ale vypnutí\n"
-"a opětovné zapnutí tiskárny ano. Pokud skon�íte, musíte zopakovat\n"
-"celý proces, pokud byste chtěli později výsledky uložit. Je důležité,\n"
-"abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
-"\n"
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
-"Před pokra�ováním si prosím velice pozorně pře�těte si tyto instrukce.\n"
-"\n"
-"Tento nástroj vám umožňuje zarovnat tiskovou hlavu vaší inkoustové\n"
-"tiskárny Epson Stylus. Zneužití tohoto nástroje může způsobit zhoršení\n"
-"kvality tisku a možná poškodit vaši tiskárnu. Správnost tohoto nástroje\n"
-"nebyla zkontrolována v Seiko Epson a tento nástroj je nabízen úplně bez\n"
-"záruky. Celé riziko používání tohoto nástroje je na vás.\n"
-"\n"
-"Tento nástroj vytiskne testovací vzorek, který sestávají ze sérií dvojic\n"
-"vertikálních �ar, které se překrývají. Pod každou dvojicí �ar je �íslo\n"
-"mezi %d a %d.\n"
-"\n"
-"Když budete zkoumat dvojice �ar, měli byste najít dvojici, která je nejlépe\n"
-"zarovnaná, to je nejlépe tvoří jedinou vertikální �áru. Zkoumejte\n"
-"dvojice velice pe�livě, abyste nalezli nejlepší odpově�. Pro kritické\n"
-"zkoumání se doporu�uje použití lupy nebo zvětšovacího skla. Také\n"
-"se doporu�uje použít pro test kvalitní papír, aby byly �áry zřetelné\n"
-"a neroztékaly se po papíru. Po vybrání �ísla odpovídajícího nejlepšímu\n"
-"páru vlože papír zpět do podava�e, než �íslo zadáte.\n"
-"\n"
-"Po zpracování vzorku zarovnání budou vzorky vytištěny ještě jednou.\n"
-"Měli byste zjistit, že nejprostřednější dvojice (#%d z %d) je nejlepší.\n"
-"Pak vám bude nabídnuto bude uložení výsledků v tiskárně (s), opakování\n"
-"procesu (r) nebo ukon�ení bez uložení (q). Ukon�ení neobnoví předchozí \n"
-"nastavení, ale vypnutí a opětovné zapnutí tiskárny ano. Pokud skon�íte,\n"
-"musíte zopakovat celý proces, pokud byste chtěli později výsledky uložit.\n"
-"Je důležité, abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
-"\n"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Nemohu odeslat příkaz tiskárně, kon�ím.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
-"Zkontrolujte prosím kone�ný výstup velice pozorně, abyste se ujistili,\n"
-"že vaše tiskárna je správně zarovnána. Nyní můžete:\n"
-"  (s) uložit výsledky do tiskárny,\n"
-"  (q) skon�it bez ukládání výsledků, nebo\n"
-"  (r) zopakovat celý proces od za�átku.\n"
-"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:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 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:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 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:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 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:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Opakuji proces zarovnávání.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
-"Toto trvale změní konfiguraci vaší tiskárny.\n"
-"VAROV�N�: tato procedura nebyla schválena Seiko Epson a může\n"
-"poškodit vaši tiskárnu. Pokra�ovat?\n"
-"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:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Připravuji se uložit nastavení..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "selhalo!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
-"Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
-"zarovnávání.\n"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "uspělo!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, 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/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Nerozpoznaný příkaz.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Poslední příkaz nebyl potvrzen.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
-"Tato procedura předpokládá, že vaše tiskárna je Epson %s.\n"
-"Pokud to není model vaší tiskárny, stiskněte nyní prosím control-C\n"
-"a zvolte váš skute�ný model tiskárny.\n"
-"\n"
-"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:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Pokra�ujte stisknutím enter > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 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:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Průchod #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Vložte prosím nový list papíru.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Číslo mimo rozsah!\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Nemohu pochopit, co jste napsali!\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Nejlepší dvojice �ar by měla mít �íslo mezi 1 a %d.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Pokouším se nastavit zarovnání..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "uspělo.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
-"Zkontrolujte prosím, že zarovnání je správné. Až bude vzorek zarovnání\n"
-"znovu vytištěn, přesvěd�te se prosím, že nejlepší vzorek v každém řádku je\n"
-"vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
-"zopakovat.\n"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Chyba ve vstupu\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Tisknu..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "UTF-8"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Dva úrovně stupňů šedi"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Sedm barev rozšířené"
+
+#, 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"
@@ -8725,18 +12741,12 @@ msgstr "Tisknu..."
 #~ msgid "High Gloss Film"
 #~ msgstr "Potah s vysokým leskem"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Lesklý fotopapír"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Lesklé foto karty"
 
 #~ msgid "Photo Paper Pro"
 #~ msgstr "Profesionální fotopapír"
 
-#~ msgid "CMY Color"
-#~ msgstr "Barvy CMY"
-
 #~ msgid "CMYK Color"
 #~ msgstr "Barvy CMYK"
 
@@ -9377,9 +13387,6 @@ msgstr "Tisknu..."
 #~ msgid "Bottom Border:"
 #~ msgstr "Spodní okraj:"
 
-#~ msgid "Media Size:"
-#~ msgstr "Velikost média:"
-
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Typ média, na který tisknete"
 
diff --git a/po/da.gmo b/po/da.gmo
index ce983be..375b23c 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 0486b51..c9bf105 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,17 +1,18 @@
-# Danish translation of gutenprint-5.2
+# Danish translation of gutenprint-5.2.0-rc1
 # Copyright (C) 2001, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gutenprint package.
 #
 # Keld Simonsen <keld@dkuug.dk>, 2001.
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
 # Mogens Jæger <mogens@jaeger.tf>, 2006, 2007, 2008.
+# Mogens Jaeger <mogensjaeger@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint 5.1.98.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
-"PO-Revision-Date: 2008-04-24 16:20+0200\n"
-"Last-Translator: Mogens Jæger <mogens@jaeger.tf>\n"
+"Project-Id-Version: gutenprint 5.2.0-rc1\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
+"PO-Revision-Date: 2008-10-07 11:36+0200\n"
+"Last-Translator: Mogens Jaeger <mogensjaeger@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Standard"
 
@@ -94,18 +95,19 @@ msgstr "Dråbestørrelse segmenteret ny"
 msgid "Density"
 msgstr "Tæthed"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr "Udskrifts niveaujustering"
 
@@ -163,9 +165,9 @@ msgstr "Farveomsætningsmodul"
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Papirstørrelse"
 
@@ -173,300 +175,345 @@ msgstr "Papirstørrelse"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "Basis printerindstillinger"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Størrelse på det papir der skal udskrives på"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "I hvilken bakke er mediet"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr "Cd center størrelse"
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Print kun udenfor centeret af Cd-en, eller helt ind til hullet"
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr "Cd størrelse (egendefineret)"
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Variabel justering af udvendig diameter på cd"
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr "Cd center størrelse (egendefineret)"
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Variabel justering af centeret på cd'en"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Cd vandret finjustering"
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Avanceret printeropsætning"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Finjustering i vandret plan til printning på Cd"
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr "Cd lodret finjustering"
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Opløsning"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Opløsning og kvalitet af udskriften"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blæktype"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Blæktype i printeren"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr "Blækkanaler"
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Avanceret printerfunktionalitet"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printningstilstand"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kerneparameter"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printnings udskriftstilstand"
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "Tosidet printning"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble indstilling"
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Udskriftskvalitet"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr "Basis udskriftsjustering"
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Tæthed for cyan"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Justér tæthed for cyan"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Tæthed for magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Justér tæthed for magenta"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Tæthed for gul"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Justér tæthed for gul"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Tæthed for sort"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Justér tæthed for sort"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Avanceret blækjustering"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr "Afbrudt"
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 msgid "CD - Custom"
 msgstr "Cd - egendefineret"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr "Print til center"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Sort og hvid"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Manuel kontrol"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Høj præcision"
@@ -499,9 +546,8 @@ msgstr "Ingen korrektioner"
 msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Gråtone"
 
@@ -517,11 +563,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -581,7 +627,7 @@ msgid "Output image type"
 msgstr "Udskrifts billedtype"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr "Ufiltrerede kanaler"
 
@@ -641,16 +687,56 @@ msgstr "Program gamma"
 msgid "Gamma value assumed by application"
 msgstr "Gammaværdi som formodet af program"
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -658,16 +744,56 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justér gamma for cyan"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -675,16 +801,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justér gamma for magenta"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Gul"
 
@@ -692,9 +858,11 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justér gamma for gul"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "Rød"
 
@@ -702,7 +870,7 @@ msgstr "Rød"
 msgid "Adjust the red gamma"
 msgstr "Justér gamma for rød"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "Grøn"
 
@@ -710,9 +878,10 @@ msgstr "Grøn"
 msgid "Adjust the green gamma"
 msgstr "Justér gamma for grøn"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "Blå"
 
@@ -721,16 +890,54 @@ msgid "Adjust the blue gamma"
 msgstr "Justér gamma for blå"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Sort"
 
@@ -738,7 +945,7 @@ msgstr "Sort"
 msgid "Adjust the black gamma"
 msgstr "Justér sort gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "Cyan balance"
 
@@ -751,7 +958,7 @@ msgstr "Grå balance"
 msgid "Adjust the cyan gray balance"
 msgstr "Justér cyans gråbalance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "Magenta balance"
 
@@ -759,7 +966,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "Gul balance"
 
@@ -786,10 +993,11 @@ msgstr "Begræns blækmængde"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr "Avanceret udskriftskontrol"
 
@@ -797,27 +1005,27 @@ msgstr "Avanceret udskriftskontrol"
 msgid "Limit the total ink printed to the page"
 msgstr "Begræns den samlede mængde blæk der printes på siden"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr "GCR overgang"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr "Justér den grå bestanddels overgangsniveau"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr "GCR nedre grænse"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr "Nedre grænse for reduktion af grå bestanddel"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr "GCR overgrænse"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr "Overgrænse for reduktion af grå bestanddel"
 
@@ -946,77 +1154,77 @@ msgstr "Grå bestanddels reduktionskurve"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionel Gutenprint farveomsætning"
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Værdi skal angives for %s\n"
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' er ikke en gyldig %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s skal være mellem %f og %f (er %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s skal være mellem %d og %d (er %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s grænser skal være mellem %f og %f\n"
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s nulstilling tilstand skal være %s\n"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr "ingen nulstilling af tæller"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr "nulstil tæller"
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukendt parametertype %s (%d)\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s uden for område (værdi %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "Arkstørrelse er ikke gyldig\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Top margin må ikke være mindre end %d\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Venstre margin må ikke være mindre end %d\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr "Højde skal være større end nul\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr "Bredde skal være større end nul\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1025,7 +1233,7 @@ msgstr ""
 "Billedet er for bredt til siden: venstre margin er %d, bredde %d, højre kant "
 "er %d\n"
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1034,371 +1242,429 @@ msgstr ""
 "Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
 "d\n"
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr "Automatisk printningstilstand"
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr "Basis udskriftsjustering"
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "Automatisk printningstilstand"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "Udskriftskvalitet"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "Udskriftens opløsning"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr "Forbedret glans"
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr "Tilføj glansforbedring"
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr "Blæk sæt"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "Printretning"
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr "Avanceret udskriftsjustering"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr "Med/uden margin"
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr "Print uden margin"
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr "Udjævningsmetode"
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr "Udjævningsmønster der skal bruges"
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr "Justér punktstørrelse som nødvendigt"
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr "Justér punktstørrelse som nødvendigt, for at opnå ønsket tæthed"
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr "Udskriftsrækkefølge"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr "Retten-ind gennemløb"
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr "Retten-ind valg"
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr "Kommando til udskiftning af blækpatron"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr "Skiftende retten-ind gennemløb"
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr "Skiftende retten-ind valg"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr "Understøtter netværkstilstand"
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr "Understøtter D4 netværkstilstand"
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr "Har udskiftelige blækpatroner"
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr "Har flere valgmuligheder af blækpatroner"
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr "Kanalnavne"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr "Ufiltreret kanal tælling"
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr "Diagram for cyan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr "Justér diagram for cyan"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr "Diagram for magenta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr "Justér diagram for magenta"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr "Diagram for gul"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr "Justér diagram for gul"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr "Diagram for blå"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr "Justér diagram for blå"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+msgid "Orange Map"
+msgstr "Diagram for orange"
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the orange map"
+msgstr "Justér diagram for orange"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr "Diagram for rød"
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr "Justér diagram for rød"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Tæthed for rød"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Justér tæthed for rød"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Tæthed for blå"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Justér tæthed for blå"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+msgid "Orange Density"
+msgstr "Tæthed for orange"
+
+#: src/main/print-escp2.c:488
+msgid "Adjust the orange density"
+msgstr "Justér tæthed for orange"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr "Justér glansniveau"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr "Lille dråbestørrelse"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr "Dråbestørrelse 1 (lille)"
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr "Mellem dråbestørrelse"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr "Dråbestørrelse 2 (mellem)"
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr "Stor dråbestørrelse"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr "Dråbestørrelse 3 (stor)"
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Light Cyan Value"
 msgstr "Lys cyan værdi"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Light Cyan Density Scale"
 msgstr "Tæthedsskala for lys cyan"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 msgid "Light Magenta Value"
 msgstr "Lys magenta værdi"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Magenta Density Scale"
 msgstr "Tæthedsskala for lys magenta"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 msgid "Dark Yellow Value"
 msgstr "Mørkegul værdi"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr "Mørkgul overgang"
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 msgid "Dark Yellow Density Scale"
 msgstr "Tæthedsskala for mørkegul"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 msgid "Gray Value"
 msgstr "Gråtone værdi"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 msgstr "Grå overgang"
 
-#: src/main/print-escp2.c:614 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:639
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 msgid "Gray Density Scale"
 msgstr "Tæthedsskala for gråtone"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
 msgstr "Lysegrå værdi"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 msgstr "Lysgrå overgang"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
 msgstr "Tæthedsskala for lysegrå"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
 msgstr "Mørkegrå værdi"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr "Mørkgrå overgang"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
 msgstr "Tæthedsskala for mørkegrå"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 msgid "Mid Gray Value"
 msgstr "Midtgrå værdi"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
 msgstr "Mellemgrå værdi"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr "Mellemgrå overgang"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr "Middelgrå overgang"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
 msgstr "Tæthedsskala for midtgrå"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
 msgstr "Tæthedsskala for mellemgrå"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr "Tørretid pr. side"
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr "Sæt tørretid pr. side"
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr "Tørretid pr. skan"
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr "Sæt tørretid pr. skan"
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr "Minimum tørretid pr. skan"
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr "Sæt minimum tørretid pr. skan"
+
+#: src/main/print-escp2.c:799
+msgid "Paper Thickness"
+msgstr "Papirtykkelse"
+
+#: src/main/print-escp2.c:800
+msgid "Set printer paper thickness"
+msgstr "Sæt printerens papirtykkelse"
+
+#: src/main/print-escp2.c:807
+msgid "Vacuum Intensity"
+msgstr "Vakuumintensitet"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr "Sæt vakuumintensitet (printerspecifikt)"
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr "Fødningsrækkefølge"
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr "Sæt papirfødningsrækkefølge (printerspecifikt)"
+
+#: src/main/print-escp2.c:823
+msgid "Print Method"
+msgstr "Printmetode"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr "Sæt printmetode (printer specifikt)"
+
+#: src/main/print-escp2.c:831
+msgid "Platen Gap"
+msgstr "Valse afstand"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr "Sæt valse afstand (printerspecifikt)"
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr "Fødningsjustering"
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr "Sæt papirfødningsjustering (0.01% units)"
+
+#: src/main/print-escp2.c:1964
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:2001
+#: src/main/print-escp2.c:1966
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Manuel kontrol"
-
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr "Kort kant (vend)"
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
 
@@ -1451,129 +1717,356 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Fire farver standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Tre farver sammensat"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Seks farver foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Almindeligt papir"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
-msgstr "Blanke film"
-
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+msgstr "Glittet film"
+
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Transparenter"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Kuverter"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Mat papir"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
-msgstr "Førsteklasses blankt fotopapir"
+msgstr "Førsteklasses glittet fotopapir"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
-msgstr "Førsteklasses glittet fotopapir"
+msgstr "Førsteklasses blankt fotopapir"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
-msgstr "Fotokvalitets blankt papir"
-
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+msgstr "Fotokvalitets glittet papir"
+
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Papir"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Andet"
 
@@ -1589,170 +2082,193 @@ msgstr "Manuel fødning med pause"
 msgid "Manual without Pause"
 msgstr "Manuel fødning uden pause"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr "Ingen"
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
-msgstr "Blankt"
+msgstr "Glittet"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr "Tekstur"
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr "Lamineret mønster"
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "Justér cyanbalance"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "Justér magentabalance"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "Justér gulbalance"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "Sort balance"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "Justér sortbalance"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Alm"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Printer papir"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Førsteklasses"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Blankt foto"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Gennemsigtighed"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Hurtigttørrende foto"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Hurtigttørrende klar film"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manuelt"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr "Bakke 1 - med indstillelig papirføring"
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Bakke 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr "Bakke 2 - med indstillelig papirføring"
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Bakke 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr "Bakke 3 - med indstillelig papirføring"
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Bakke 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr "Bakke 4 - med indstillelig papirføring"
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Bakke 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Alternativ arkføder"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Intern arkføder"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Bakke"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Valgfri kilde"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Autoudvælg"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monokrom"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr "Kladde"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr "Høj"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Farve + sort patroner"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Farve + foto patroner"
 
@@ -1760,6402 +2276,9745 @@ msgstr "Farve + foto patroner"
 msgid "PPDFile"
 msgstr "PPDfil"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "PPD fil"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Model Name"
 msgstr "Modelnavn"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr "PPD fil modelnavn"
 
-#: src/main/print-raw.c:223
+#: src/main/print-ps.c:316
+msgid "None; please provide a PPD file"
+msgstr "Ingen; fremskaf en PPD fil"
+
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Egendefineret"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr "Billedets størrelse skal passe til papirets størrelse"
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "To-niveau gråskala"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr "Hurtig økonomisk"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
-msgstr "Tre-niveau gråskala"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr "Økonomisk"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "FireTone grå"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
+msgstr "Super foto"
 
-#: src/main/escp2-channels.c:1466
-msgid "Four Color Photo"
-msgstr "Fire farver foto"
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
+msgstr "Ultra foto"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Seks farver forbedret sammensat"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr "Bedst"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Syv farver foto"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Tekst"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Syv farver forbedret"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Grafik"
 
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
-msgstr "Otte farver foto"
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Blandet tekst og grafik"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "En farve ufiltreret"
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Fotografi"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
-msgstr "En farve ufiltreret forbedret glans"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Linie-kunst"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "To farver ufiltreret"
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Side størrelse"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
-msgstr "Tre farver ufiltreret"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Job"
 
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
-msgstr "Fire farver ufiltreret, glans "
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Billedtype"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "Fire farver ufiltreret"
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Billedtype der skal udskrives"
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
-msgstr "Fire farver ufiltreret, glans"
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Job type"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
-msgstr "Fem farver ufiltreret"
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Jobindstilling i modsætning til sideindstilling"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Seks farver ufiltreret"
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Sidenummer"
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Seks farver forbedret glans ufiltreret"
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Sidenummer"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Syv farver ufiltreret"
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Kurvetype"
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Syv farver forbedret glans ufiltreret"
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "Er denne kurve lineær, tilpasset med interpolation eller fri-form"
 
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
-msgstr "Otte farver ufiltreret"
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Minimum X"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
-msgstr "Epson standard blæk"
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Mindst mulige værdi for X"
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
-msgstr "UltraChrome foto sort"
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Maksimum X"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
-msgstr "UltraChrome mat sort"
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Størst mulige værdi for X"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Minimum Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Mindst mulige værdi for Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Maksimum Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Størst mulige værdi for Y"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gamma værdi"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Tommer"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Brug tommer som basisenhed ved målangivelse"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Brug centimeter som basisenhed ved målangivelse"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Punkter"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Brug punkter (1/72\") som basisenhed ved målangivelse"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr "mm"
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Brug millimeter som basisenhed ved målangivelse"
+
+#: 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 "Brug picas (1/12\") som basisenhed ved målangivelse"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Farveudskrift"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Print gråtoner med sort blæk"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Standard kommando"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Brug standarddefineret printerkommando"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Egendefineret kommando"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Anvend egendefineret printerkommando"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Fil"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Udskriv til fil"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Ret kurve..."
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Sæt som standard"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Genskab forrige"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr "O.k"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/gutenprintui2/panel.c:642
+msgid "Select File..."
+msgstr "Vælg fil..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr "Nulstil"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Udskriv v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Om"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"    Print og\n"
+"gem opsætning"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"    Gem\n"
+"opsætning"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Udskriv"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Smugkig"
+
+#: 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 ""
+"Placer billedet på siden.\n"
+"Klik og træk med venstre musetaste for at placere billedet.\n"
+"Klik og træk med højre musetaste for at flytte billedet med større "
+"præcision. Hver enhed af bevægelse flytter billedet et punkt (1/72\").\n"
+"Klik og træk med midterste musetaste for at flytte billedet i enheder af "
+"billedets størrelse.\n"
+"Tryk på skift tasten når du klikker og trækker bevirker, at billedet kun "
+"flyttes i enten lodret eller vandret retning.\n"
+"Hvis du trykker på en anden musetaste mens du trækker med musen, vil "
+"billedet returnere til dets oprindelig position."
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Papirstørrelse"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Vis alle papirstørrelser"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Størrelser:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Bredde:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Bredden af det papir der skal udskrives på"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Højde:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Højden af det papir der skal udskrives på"
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Automatisk papirstørrelse"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Antal kopier"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Vælg antal kopier; skal være mellem 1 og 100"
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Billedposition"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Portræt"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Tværformat"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Vendt op/ned"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Tværformat vendt op/ned"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
+"ned"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientering:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Venstre:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Afstand fra venstre side af arket til billedet"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Højre:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Afstand fra venstre papiretkant til højre side af billedet"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Afstand fra højre papirkant til billedet"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Øverst:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Afstand fra toppen af arket til billedet"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Nederst:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Afstand fra toppen af arket til bunden af billedet"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Afstand fra den nederste kant af arket til billedet"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centrér:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Vandret"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centrér billedet i vandret på papiret"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Begge"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centrér billedet på papiret"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Lodret"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centrér billedet i lodret på papiret"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Indstil printer"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Printer mærke:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Vælg dit printermærke"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Printermodel:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Vælg din printermodel"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD-fil:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Angiv korrekt PPD filnavn for printeren"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Bladr igennem"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Vælg korrekt PPD filnavn for printeren"
+
+#: 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 ""
+"Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
+"ønsker at printe til"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Printerkø:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Angiv den korrekte kommando til printning på din printer. "
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Angiv hvilken fil du vil skrive til. "
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "Fil der skal skrives til"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Udskriv til fil"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definér ny printer"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Printernavn:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Angiv et navn til denne logiske printer"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "Om Gutenprint"
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Gutenprint version"
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Printer indstillinger"
+
+#: 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 ""
+"Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
+"at udskrive til"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Opsætning printer..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
+"denne printer"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Ny printer..."
+
+#: 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 ""
+"Definer en ny logisk printer. Dette kan bruges til at navngive en samling af "
+"indstillinger, som du ønsker at huske til senere brug."
+
+#: src/gutenprintui2/panel.c:2150
+msgid "Set Printer Option Defaults"
+msgstr "Sæt printerindstilling til standardværdier"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr "Sæt alle printerindstillinger til standardværdier"
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Billedstørrelse"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Skalering:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Angiv skalering (størrelse) af billedet"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Skalér med:"
+
+#: 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 ""
+"Vælg om skalering måles i procent af valgt arkstørrelse, eller antal af "
+"udskriftspunkter pr. tomme"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Procent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Skalér udskriften til arkstørrelsen"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Skalér udskriften til antal punkter pr. tomme"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Angiv bredden af udskriften"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Angiv højden på udskriften"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Brug original\n"
+"billedstørrelse"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Udskrifts-farvejustering"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Sæt til standardværdier"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Luk"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Smugkig af billede"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "Vis udskriftskanaler:"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Udskrift"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Udskriftstype:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Vælg den ønskede udskriftstype"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Justér udskrift..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "MÃ¥l-enhed:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Enheder:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Vælg basisenhed for målangivelse ved printning"
+
+#: 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 "Printer"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Standard printer)"
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr "Printer egenskaber"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr "Udskriftskontrol"
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr "Almindelig"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr "Ekstra 1"
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr "Ekstra 2"
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr "Ekstra 3"
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr "Ekstra 4"
+
+#: src/cups/genppd.c:155
+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
+msgid "English"
+msgstr "Danish"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+msgid "Media Size"
+msgstr "Mediestørrelse"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+msgid "Color Model"
+msgstr "Farvemodel"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+msgid "Inverted Grayscale"
+msgstr "Inverteret gråtoneskala"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+msgid "RGB Color"
+msgstr "RGB farver"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY farver"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr "Farvepræcision"
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr "Omvendt"
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr "2-sidet udskrivning"
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr "Formindsk side så den passer til kanter"
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr "Formindsk (udskriv hele siden)"
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr "Beskær (bevar format)"
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr "Udvid (brug hele arket)"
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "Nej"
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr "Værdi"
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr "Finjustering"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil version "
+
+#: 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-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Dette program er fri software; du kan redistribuere det og/eller modificere "
+"det\n"
+"under bestemmelserne i the GNU General Public License som offentliggjort af\n"
+"the Free Software Foundation; enten version 2 af licensen, eller (efter dit "
+"valg)\n"
+"enhver senere version.\n"
+"\n"
+"Dette program er distribueret i det håb, at det vil være nyttigt, men\n"
+"UDEN ENHVER FOR FOR GARANTI, endda uden den underforståede\n"
+"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n"
+"Se GNU General Public License for yderligere detaljer.\n"
+"\n"
+"Du skulle have modtaget en kopi af GNU General Public License sammen\n"
+"med dette program. Hvis ikke, skriv da til Free Software Foundation, Inc .,\n"
+"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#: src/escputil/escputil.c: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 ""
+"Brug: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C valg] [-p mønstre]\n"
+"Udfører vedligeholdelse på EPSON Stylus (R) printere.\n"
+"Eksempler: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name på min-kø\n"
+"\n"
+"  Kommandoer:\n"
+"    -c|--clean-head    Renser print hoved.\n"
+"    -n|--nozzle-check  Printer et dyse-test mønster.\n"
+"                       Beskidte eller stoppede dyser viser sig som huller i\n"
+"                       mønsteret. Hvis der er huller, bør du rense\n"
+"                       print hovedet.\n"
+"    -a|--align-head    Retter printhovedet ind.    FORSIGTIG     forkert "
+"brug\n"
+"                       af denne funktion kan resultere i dårlig "
+"printkvalitet, og/eller\n"
+"                       forårsage direkte skade på printeren.\n"
+"    -s|--status        Viser printer status.\n"
+"    -i|--ink-level     Henter blæk niveau fra printeren. Dette kræver\n"
+"                       direkte læse/skrive adgang til printeren.\n"
+"    -e|--extended-ink-info     Henter udvidet information om blæk niveau "
+"fra\n"
+"                        printeren. Dette kræver direkte læse/skrive adgang "
+"til printeren.\n"
+"    -d|--identify      Forespørger printer om fremstiller og model.Dette\n"
+"                       kræver direkte læse/skrive adgang til printeren.\n"
+"    -l|--license       Viser licens/garanti bestemmelser for dette program.\n"
+"    -M|--list-models   Lister de tilgængelige printermodeller.\n"
+"    -h|--help          Printer denne hjælpe meddelelse.\n"
+"  Indstillinger:\n"
+"    -P|--printer-name  Specificer den valgte printerkø.\n"
+"                       Uden angivelse = system printeren lp.\n"
+"    -r|--raw-device    Specificer navnet på den enhed der skrives til "
+"direkte\n"
+"                       i stedet for at gå gennem en printerkø.\n"
+"    -m|--model         Specificer den præcise printermodel.\n"
+"    -u|--new           Printeren er ny (Stylus Color 740 eller nyere).\n"
+"                       Bruges kun når der ikke anvendes direkte adgang.\n"
+"    -q|--quiet         Undertrykker banneret.\n"
+"    -S|--short-name    Printer kort-navn for printer med --identify.\n"
+"    -C|--choices       Angiv antallet af mønstre, ved printerhoved retten "
+"ind.\n"
+"    -p|--patterns      Angiv antallet af sæt af mønstre, ved printerhoved "
+"retten ind.\n"
+
+#: src/escputil/escputil.c: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 ""
+"Brug: escputil [Indstillinger] [Kommandoer]\n"
+"Brug: escputil [-c | -n | -a | -i -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C valg] [-p mønstre]\n"
+"Udfør vedligeholdelse på EPSON Stylus (R) printere.\n"
+"Eksempler: escputil -c -u -P min-kø\n"
+"          escputil -i -r /dev/usb/lp0\n"
+"\n"
+"  Kommandoer:\n"
+"    -c Renser print hoved.\n"
+"    -n Printer en dyse test.\n"
+"          Beskidte eller stoppede dyser viser sig som huller i\n"
+"          mønsteret. Hvis der er huller, bør du rense\n"
+"          print hovedet.\n"
+"    -a Retter printhovedet ind.    FORSIGTIG     forkert brug\n"
+"          af denne funktion kan resultere i dårlig printkvalitet, eller\n"
+"          forårsage direkte skade på printeren.\n"
+"    -s Viser printer status.\n"
+"    -i Henter blæk niveau fra printeren. Dette kræver\n"
+"          direkte læse/skrive adgang til printeren.\n"
+"    -e Hent udvidede blæk-informationer fra printeren.\n"
+"          Kun for R800 printeren, eller tilsvarende. Dette kræver\n"
+"          direkte læse/skrive adgang til printeren.\n"
+"    -d Forespørger printer om fremstiller og model.Dette\n"
+"          kræver direkte læse/skrive adgang til printeren.\n"
+"    -l Viser licens/garanti bestemmelser for dette program.\n"
+"    -M Lister de tilgængelige printermodeller.\n"
+"    -h Printer denne hjælpe meddelelse.\n"
+"  Indstillinger:\n"
+"    -P Specificer den valgte printerkø.\n"
+"          Uden angivelse = system printeren lp.\n"
+"    -r Specificer navnet på den enhed der skrives til direkte\n"
+"         i stedet for at gå gennem en printerkø.\n"
+"    -u Printeren er ny (Stylus Color 740 eller nyere).\n"
+"        Kun nødvendigt hvis der bruges andet end en printer med\n"
+"        direkte læse/skrive adgang.\n"
+"    -q Undertrykker banneret.\n"
+"    -S Printer kort-navn for printer med -d.\n"
+"    -m Specificer den præcise printermodel til brug for\n"
+"           indretning af printhoved (alignment).\n"
+"    -C Angiv antallet af mønstre, ved printerhoved retten ind.\n"
+"    -p Angiv antallet af sæt af mønstre, ved printerhoved retten ind.\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Du kan kun specificere en printer eller en ufiltreret enhed."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Du kan kun specificere en printermodel."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Retten-ind valg skal mindst være 1."
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Retten-ind gennemløb skal være mindst 1."
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Ukendt indstilling %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Brug: %s [Indstillinger] kommando\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Tast `%s --help' for yderligere information.\n"
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Tast `%s -h' for yderligere information.\n"
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Kan ikke åbne enheden %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Kan ikke printe til printer %s med %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Er ikke i stand til at sende kommando til printeren\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Læsning fra printer overskred tidsgrænsen\n"
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Kan ikke læse fra %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr "Angiv en ufiltreret enhed\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Kan ikke åbne %s læse/skrive: %s\n"
+
+#: src/escputil/escputil.c:783
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Ukendt printer %s!\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Kan ikke skrive til %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Kan ikke skrive til %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Kan ikke detektere printertype.\n"
+"Brug -m for at specificere din printermodel.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr "Foto sort"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
-msgstr "Mat sort"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "Ukendt"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
-msgstr "Mørk gul"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
+msgstr "Mat sort"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr "Lys lys-sort"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Almindeligt papir hurtigindføring"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+msgid "Orange"
+msgstr "Orange"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
-msgid "Postcard"
-msgstr "Postkort"
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr "Status: Fejl\n"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
-msgid "Back Light Film"
-msgstr "Baglys film"
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Status: Selv-printning\n"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
-msgid "Matte Paper Heavyweight"
-msgstr "Heavyweight mat papir"
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Status: Optaget\n"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
-msgstr "Premium silkemat fotopapir"
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Status: Venter\n"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-msgid "ColorLife Paper"
-msgstr "ColorLife papir"
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Status: Ledig\n"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-msgid "Archival Matte Paper"
-msgstr "Arkivfast mat papir"
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Status: Sat til pause\n"
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr "Vandfarvepapir - strålende hvidt"
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Status; Renser\n"
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Rulle fødning"
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Status: Fabriksindstillet\n"
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr "Rulle fødning (skær efter hver side)"
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Status: Lukker ned\n"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr "Rulle fødning (ingen afskæring)"
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Status Ukendt (%d)\n"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "Manuel fødning"
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Fejl: Fatal fejl\n"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "Udskriv på Cd"
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Fejl: Anden tilslutning valgt\n"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
-msgstr "Manuel ark guide"
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Fejl: Låg åbent\n"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-msgid "Manual Feed (Front)"
-msgstr "Manuel fødning (front)"
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Fejl: Papir problemer\n"
 
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
-msgstr "Bagerste bakke"
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Fejl: Blæk slut\n"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr "Front bakke"
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Fejl: Papir slut\n"
 
-#: src/main/escp2-papers.c:1988
-msgid "Photo Board"
-msgstr "Foto plade"
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Fejl: Diverse papirfejl\n"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr "Tilskårne ark, bakke 1"
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr "Fejl: Overløb vedligeholdelsespatron\n"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
-msgstr "Tilskårne ark, bakke 2"
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr "Fejl: Afvent returnering fra afrivningsposition\n"
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
-msgstr "Automatisk valg af bakke"
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Fejl: Dobbeltfødningsfejl\n"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
-msgstr "Manuel udvælgelse"
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+"Fejl: Blækpatron-udløserarm aktiveret\n"
+"\n"
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Fejl: Uoprettelig papirskærerfejl\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Fejl: Genoprettelig papirskærerproblem\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr "Fejl: Ingen vedligeholdelsespatron fundet\n"
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Fejl: Bagsidelåg åben\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Fejl: CD-skuffe tom\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Fejl: Kortlæsningsfejl\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Fejl: Skuffelåg åben\n"
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Fejl: Vedligeholdelsespatronlåg åben\n"
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr "Fejl: Frontlåg åben\n"
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Fejl: Vedligeholdelses anmodning\n"
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Fejl: Ukendt (%d)\n"
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Advarsel: %s blækniveau lavt\n"
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Advarsel: Kanal %d blækniveau lavt\n"
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr "Advarsel: %s rensning fravalgt\n"
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr "Advarsel: Kanal %d rensning\n"
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr "Advarsel: Vedligeholdelsespatron næsten fuld\n"
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr "Advarsel: Vedligeholdelse anmodning pågår\n"
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Advarsel: Ukendt (%d)\n"
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Printer dyse selv-test\n"
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Blækniveauer:\n"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Blæk farve"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Procent tilbage"
+
+#: src/escputil/escputil.c:1298
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr "Printernavn: %s\n"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr "Job-navn: "
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr "blækniveauer"
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "status"
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr "Blækpatron"
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr "Del nummer"
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "Dato"
+
+#: src/escputil/escputil.c:1713
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
+
+#: src/escputil/escputil.c:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Kan ikke identificere printermodel.\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Renser hoveder...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Læs disse instruktioner grundigt før du fortsætter.\n"
+"\n"
+"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
+"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
+"i print kvalitet, og sandsynligvis skade din printer. Denne funktion er "
+"ikke\n"
+"blevet testet af Seiko Epson for korrekt funktion, og tilbydes uden nogen\n"
+"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
+"regning og risiko.\n"
+"\n"
+"Denne funktion printer %d test mønstre. Hvert mønster ser ens ud.\n"
+"Mønstrene består af en serie af lodrette liniepar der overlapper.\n"
+"Under hvert liniepar er der et nummer mellem %d og %d.\n"
+"\n"
+"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
+"rettet-ind, d.v.s. det par der bedst danner en ret linie.\n"
+"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
+"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
+"par.\n"
+"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne\n"
+"er præcist formede og ikke 'løber ud' i papiret.\n"
+"Når du har valgt det flotteste par, og har noteret tallet under, lægges\n"
+"papiret i printeren igen, inden tallet indtastes.\n"
+"\n"
+"Hvert mønster er identisk, men senere mønstre anvender en finere dot\n"
+"for en mere kritisk retten-ind. Du skal køre alle gennemløbene for at opnå\n"
+"en perfekt retten-ind af din printer. Når du har kørt alle gennemløbene, "
+"bliver\n"
+"mønsteret printet igen. Nu skal det midterste af parrene (#%d ud af de %d)\n"
+"være det bedste.\n"
+"\n"
+"NÃ¥r dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
+"gentage(r) processen, eller afbryde(q) uden at gemme. NÃ¥r du afbryder,\n"
+"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
+"for\n"
+"printeren. Det er derfor vigtigt at der ikke bliver slukket for printeren "
+"mens\n"
+"processen løber.\n"
+"\n"
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Læs disse instruktioner grundigt før du fortsætter.\n"
+"\n"
+"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
+"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
+"i print kvalitet, og sandsynligvis skade din printer. Denne funktion er "
+"ikke\n"
+"blevet testet af Seiko Epson for korrekt funktion, og tilbydes uden nogen\n"
+"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
+"regning og risiko.\n"
+"\n"
+"Denne funktion printer et test mønster der består af en serie af\n"
+"lodrette liniepar der overlapper.\n"
+"Under hvert liniepar er der et nummer mellem %d og %d.\n"
+"\n"
+"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
+"rettet-ind, d.v.s. det par der bedst danner en ret linie.\n"
+"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
+"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
+"par.\n"
+"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne "
+"er\n"
+"præcist formede og ikke 'løber ud' i papiret.\n"
+"Når du har valgt det flotteste par, og har noteret tallet under, lægges "
+"papiret\n"
+"i printeren igen, inden tallet indtastes.\n"
+"\n"
+"Når du har kørt retten-ind mønsteret, bliver det printet igen. Nu skal det\n"
+"midterste af parrene (#%d ud af de %d) være det bedste.\n"
+"\n"
+"NÃ¥r dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
+"gentage(r) processen, eller afbryde(q) uden at gemme. NÃ¥r du afbryder,\n"
+"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
+"for\n"
+"printeren. Det er derfor vigtigt at der ikke bliver slukket for printeren "
+"mens\n"
+"processen løber.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr "Afbryder\n"
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Kontroller det endelige udskrift meget omhyggeligt, for at sikre dig,\n"
+"at din printer er korrekt rettet-ind. Du kan nu:\n"
+"  (s) gemme resultatet i printeren,\n"
+"  (q) afbryde uden at gemme noget, eller\n"
+"  (r) gentage hele processen forfra.\n"
+"Du vil så blive bedt om at bekræfte dit valg.\n"
+"Hvad vil du gøre (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, c-format
+msgid ""
+"OK, your printer is aligned, but the alignment has not been saved.\n"
+"If you wish to save the alignment, you must repeat this process.\n"
+msgstr ""
+"O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n"
+"Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
+
+#: src/escputil/escputil.c:1899
+#, 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:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Gentager processen med at retten-ind.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Dette vil blivende ændre konfigurationen af din printer.\n"
+"ADVARSEL: denne procedure er ikke blevet godkendt af Seiko Epson,\n"
+"og det kan skade din printer. Fortsæt?\n"
+"Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
+"printer:\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Klar til at gemme indstillingerne..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "mislykkedes!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
+"processen.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "lykkedes!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Kommandoen blev ikke genkendt.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Afsluttende kommando blev ikke bekræftet.\n"
+
+#: src/escputil/escputil.c:1950
+#, 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 ""
+"Denne procedure går ud fra, at din printer er en %s.\n"
+"Hvis dette ikke er din printermodel, tast ctrl-C nu, og vælg\n"
+"din aktuelle printermodel.\n"
+"\n"
+"Placer et ark papir i printeren, og begynd retten-ind\n"
+"processen af print hovedet.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Tryk på enter-tasten for at fortsætte > "
+
+#: src/escputil/escputil.c:2026
+#, c-format
+msgid ""
+"Please inspect the print, and choose the best pair of lines in each "
+"pattern.\n"
+"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
+msgstr ""
+"Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n"
+"Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Gennemløb #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Indsæt et nyt ark papir.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Antal uden for givet område!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Jeg kan ikke tolke hvad du tastede!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Prøver at sætte retten-ind..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "lykkedes.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Kontroller at retten-ind er korrekt. Efter retten-ind mønsteret er printet "
+"igen,\n"
+"skal du sikre dig, at det bedste mønster for hver linie er mønster %d.\n"
+"Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
+"bedste kvalitet i printning.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Fejl i inddata\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Udskriver..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr "Epson standard blæk"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+msgid "Bright White Paper"
+msgstr "Lyst hvidt papir"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
+msgid "Postcard"
+msgstr "Postkort"
+
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
+msgid "Back Light Film"
+msgstr "Baglys film"
+
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
+msgid "Matte Paper Heavyweight"
+msgstr "Heavyweight mat papir"
+
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr "Førsteklasses præsentationspapir mat"
+
+#: src/xml/xmli18n-tmp.h:27
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Førsteklasses blankt fotopapir 170 gram"
+
+#: src/xml/xmli18n-tmp.h:29
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Førsteklasses blankt fotopapir 250 gram"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+msgid "Ultra Glossy Photo Paper"
+msgstr "Højglans fotopapir"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
+msgstr "Førsteklasses silkemat fotopapir"
+
+#: src/xml/xmli18n-tmp.h:35
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Førsteklasses silkemat fotopapir 170 gram"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Førsteklasses silkemat fotopapir 250 gram"
+
+#: src/xml/xmli18n-tmp.h:41
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Førsteklasses blankt fotopapir 250 gram"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Ultra førsteklasses blankt fotopapir"
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+msgid "ColorLife Paper"
+msgstr "ColorLife papir"
+
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "FireTone grå"
+
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Almindeligt papir hurtigindføring"
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+msgid "Archival Matte Paper"
+msgstr "Arkivfast mat papir"
+
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr "Vandfarvepapir - strålende hvidt"
+
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
+msgstr "UltraChrome foto sort"
+
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr "UltraChrome mat sort"
+
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI hurtig økonomisk"
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 DPI økonomisk"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr "180 DPI økonomisk"
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 DPI kladde"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
-msgstr "360 x 240 DPI kladde"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 DPI høj kvalitet"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI forbedret"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr "720 DPI høj kvalitet"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
+msgstr "360 x 120 DPI økonomisk"
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 DPI højeste kvalitet"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr "360 x 240 DPI kladde"
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
-msgstr "720 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr "720 DPI høj kvalitet"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI vendt om"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 DPI vendt om"
-
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
-msgstr "5760 x 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr "Mørk gul"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr "Tændt"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI vendt om"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
-msgstr "Udjævning"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI forbedret"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr "Fuld overlapning"
+#: src/xml/xmli18n-tmp.h:2922
+msgid "Black 1"
+msgstr "Sort 1"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
-msgstr "Fire gennemløb"
+#: src/xml/xmli18n-tmp.h:2923
+msgid "Black 2"
+msgstr "Sort 2"
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
-msgstr "Fuld overlapning 2"
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+msgid "360 DPI Enhanced"
+msgstr "360 DPI forbedret"
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
-msgstr "Udjævning 2"
+#: src/xml/xmli18n-tmp.h:2959
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 DPI høj kvalitet"
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
-msgstr "Otte gennemløb"
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
+msgstr "Bagerste bakke"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Hurtig økonomisk"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
+msgstr "Front bakke"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Økonomisk"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "Manuel fødning"
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Kladde"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "Udskriv på Cd"
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
-msgstr "Høj"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr "Rulle fødning (skær efter hver side)"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Foto"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
+msgstr "Rulle fødning (ingen afskæring)"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super foto"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Rulle fødning"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra foto"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
+msgstr "Manuel ark guide"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr "Bedst"
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+msgid "Manual Feed (Front)"
+msgstr "Manuel fødning (front)"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr "Tekst"
+#: src/xml/xmli18n-tmp.h:3104
+msgid "Photo Board"
+msgstr "Foto plade"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr "Grafik"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr "Tilskårne ark, bakke 1"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr "Blandet tekst og grafik"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr "Tilskårne ark, bakke 2"
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "Fotografi"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
+msgstr "Automatisk valg af bakke"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Linie-kunst"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr "Manuel udvælgelse"
 
-#: src/main/generic-options.c:55
-msgid "Page"
-msgstr "Side størrelse"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "En farve ufiltreret"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr "Job"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
+msgstr "Tre farver ufiltreret"
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
-msgstr "Billedtype"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "Fire farver ufiltreret"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
-msgstr "Billedtype der skal udskrives"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
+msgstr "Fem farver ufiltreret"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
-msgstr "Job type"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Seks farver ufiltreret"
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
-msgstr "Jobindstilling i modsætning til sideindstilling"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
+msgstr "En farve ufiltreret forbedret glans"
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
-msgstr "Sidenummer"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
+msgstr "Fire farver ufiltreret, glans "
 
-#: src/main/generic-options.c:81
-msgid "Page number"
-msgstr "Sidenummer"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
+msgstr "Fire farver ufiltreret, glans"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Seks farver forbedret glans ufiltreret"
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Syv farver forbedret glans ufiltreret"
+
+#: src/xml/xmli18n-tmp.h:3210
+msgid "Default Black"
+msgstr "Standard sort"
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Syv farver foto"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Seks farver forbedret sammensat"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Syv farver ufiltreret"
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "To-niveau gråskala"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "To farver ufiltreret"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr "Otte farver foto"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr "Otte farver ufiltreret"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+msgid "Four Color Photo"
+msgstr "Fire farver foto"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
+msgstr "Udjævning"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr "Fuld overlapning"
+
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr "Fire gennemløb"
+
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr "Fuld overlapning 2"
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr "Udjævning 2"
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr "Otte gennemløb"
+
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr "Tændt"
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapir (riv-af kanter)"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 msgid "C0 landscape"
 msgstr "C0 tværformat"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 msgid "C1 landscape"
 msgstr "C1 tværformat"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 msgid "C2 landscape"
 msgstr "C2 tværformat"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 msgid "C3 landscape"
 msgstr "C3 tværformat"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 msgid "C4 landscape"
 msgstr "C4 tværformat"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 msgid "C5 landscape"
 msgstr "C5 tværformat"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 msgid "B6-C4 landscape"
 msgstr "B6-C4 tværformat"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 msgid "C6 landscape"
 msgstr "C6 tværformat"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 msgid "DL landscape"
 msgstr "DL tværformat"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 msgid "C7-6 landscape"
 msgstr "C7-6 tværformat"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 msgid "C7 landscape"
 msgstr "C7 tværformat"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 msgid "C8 landscape"
 msgstr "C8 tværformat"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 msgid "C9 landscape"
 msgstr "C9 tværformat"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 msgid "C10 landscape"
 msgstr "C10 tværformat"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr "ArchA vendt"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr "ArchB vendt"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr "ArchC vendt"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr "ArchD vendt"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr "ArchE vendt"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japanese lang kuvert #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese lang kuvert #3 tværformat"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japanese lang kuvert #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese lang kuvert #4 tværformat"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku kuvert #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese Kaku kuvert #4 tværformat"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 tværformat"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Monarch kuvert"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 msgid "Monarch Envelope landscape"
 msgstr "Monarch kuvert tværformat"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr "Card"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Egendefineret"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89 mm rulle papir"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210mm rulle papir"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr "17 tommer rulle papir"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr "60 tommer rulle papir"
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr "64 tommer rulle papir"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr "Postscript Level 1"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr "Postscript Level 2"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+msgid "Epson B-300"
+msgstr "Epson B-300"
+
+#: src/xml/xmli18n-tmp.h:3825
+msgid "Epson B-308"
+msgstr "Epson B-308"
+
+#: src/xml/xmli18n-tmp.h:3826
+msgid "Epson B-500DN"
+msgstr "Epson B-500DN"
+
+#: src/xml/xmli18n-tmp.h:3827
+msgid "Epson B-508DN"
+msgstr "Epson B-508DN"
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1900"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX560"
+
+#: src/xml/xmli18n-tmp.h:3988
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
-msgstr "Epson Stylus Photo R800"
-
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7800"
+
+#: src/xml/xmli18n-tmp.h:3997
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7880"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9800"
+
+#: src/xml/xmli18n-tmp.h:4002
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9880"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11880"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+msgid "Epson Stylus CX5500"
+msgstr "Epson Stylus CX5500"
+
+#: src/xml/xmli18n-tmp.h:4032
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Epson Stylus CX7000F"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+#, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+msgid "Epson Offirio PX B300"
+msgstr "Epson Offirio PX B300"
+
+#: src/xml/xmli18n-tmp.h:4183
+msgid "Epson Offirio PX B500"
+msgstr "Epson Offirio PX B500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+msgid "Epson PX G5300"
+msgstr "Epson PX G5300"
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
-msgstr "Brother HL-4Ve"
-
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
-msgstr "Brother HL-10V"
-
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
-msgstr "Brother HL-10h"
-
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
-msgstr "Brother HL-630"
-
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
-msgstr "Brother HL-660"
-
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
-msgstr "Brother HL-760"
-
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
-msgstr "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-8045D"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/xml/xmli18n-tmp.h:4212
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:4213
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:4214
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:4215
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:4218
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/xml/xmli18n-tmp.h:4219
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/xml/xmli18n-tmp.h:4220
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:4221
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
+msgstr "Brother HL-1430"
+
+#: src/xml/xmli18n-tmp.h:4223
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
+msgstr "Brother HL-1450"
+
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1470N"
+
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
+msgstr "Brother HL-1650"
+
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1670N"
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr "Brother HL-1850"
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1870N"
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr "Brother HL-2460"
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr "Brother HL-2460N"
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr "Brother HL-5030"
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr "Brother HL-5040"
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr "Brother HL-5050"
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr "Brother HL-5070N"
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr "Brother HL-5140"
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr "Brother HL-5150D"
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-5170DN"
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr "Brother HL-7050"
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr "Brother HL-7050N"
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-N2050"
+
+#: src/xml/xmli18n-tmp.h:4282
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-N2050+"
+
+#: src/xml/xmli18n-tmp.h:4283
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-N2050PS"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-N2050PS+"
+
+#: src/xml/xmli18n-tmp.h:4285
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-N2120"
+
+#: src/xml/xmli18n-tmp.h:4286
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-N2500"
+
+#: src/xml/xmli18n-tmp.h:4287
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-N2500PS"
+
+#: src/xml/xmli18n-tmp.h:4288
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-N2750"
+
+#: src/xml/xmli18n-tmp.h:4289
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-N2750PS"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:623
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4295
 msgid "Generic PCL 4 LF Printer"
-msgstr "Generic PCL 4 Printer"
+msgstr "Generic PCL 4 LF Printer"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:625
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4297
 msgid "Generic PCL 5 LF Printer"
-msgstr "Generic PCL 5 Printer"
+msgstr "Generic PCL 5 LF Printer"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:627
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4299
 msgid "Generic PCL 5c LF Printer"
-msgstr "Generic PCL 5c Printer"
+msgstr "Generic PCL 5c LF Printer"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:629
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4301
 msgid "Generic PCL 5e LF Printer"
-msgstr "Generic PCL 5e Printer"
+msgstr "Generic PCL 5e LF Printer"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:631
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4303
 msgid "Generic PCL 6/PCL XL LF Printer"
-msgstr "Generic PCL 6/PCL XL Printer"
+msgstr "Generic PCL 6/PCL XL LF Printer"
+
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr "Gestetner 10512"
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr "Gestetner 2212"
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr "Gestetner 2712"
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr "Gestetner 3212"
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr "Gestetner 3502"
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr "Gestetner 3532"
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr "Gestetner 4235g"
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr "Gestetner 4502"
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr "Gestetner 4532"
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr "Gestetner 4245g"
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr "Gestetner 6002"
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr "Gestetner 7502"
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr "Gestetner 9002"
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr "Gestetner DSm415"
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr "Gestetner DSm615"
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr "Gestetner DSm616"
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr "Gestetner DSm618"
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr "Gestetner DSm618d"
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr "Gestetner DSm620"
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr "Gestetner DSm620d"
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr "Gestetner DSm622"
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr "Gestetner DSm627"
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr "Gestetner DSm635"
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr "Gestetner DSm635G"
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr "Gestetner DSm645"
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr "Gestetner DS645G"
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr "Gestetner DSm651"
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr "Gestetner DSm660"
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr "Gestetner DSm675"
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr "Gestetner DSm725"
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr "Gestetner DSm730"
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr "Gestetner DSm735"
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr "Gestetner DSm735G"
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr "Gestetner DSm745"
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr "Gestetner DSm745G"
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr "Gestetner MP1100"
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr "Gestetner DSm7110"
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr "Gestetner MP1350"
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr "Gestetner DSm7135"
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr "Gestetner MP1600"
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr "Gestetner DSm716"
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr "Gestetner MP2000"
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr "Gestetner DSm721d"
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr "Gestetner MP2500"
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr "Gestetner DSm625"
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr "Gestetner MP3500"
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr "Gestetner DSm735e"
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr "Gestetner MP4500"
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr "Gestetner DSm745e"
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr "Gestetner MP5500"
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr "Gestetner DSm755"
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr "Gestetner MP6500"
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr "Gestetner DSm765"
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr "Gestetner MP7500"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr "Gestetner DSm775"
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr "Gestetner MP9000"
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr "Gestetner DSm790"
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr "Gestetner MP 161"
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr "Gestetner DSm416"
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr "Gestetner MP 2510"
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr "Gestetner DSm725e"
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr "Gestetner MP 2550"
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr "Gestetner MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr "Gestetner MP 3010"
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr "Gestetner DSm730e"
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr "Gestetner MP 3350"
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr "Gestetner MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr "Gestetner MP 4000"
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr "Gestetner MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr "Gestetner MP 5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr "Gestetner MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1160"
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1320"
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2410"
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 2420"
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2430"
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 3015"
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 3020"
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 3030"
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 3050"
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 3052"
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3055"
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3380"
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3390"
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 3392"
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4240"
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4250"
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4345 mfp"
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4350"
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 5200"
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 5200L"
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9040"
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 9040 MFP"
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 9050"
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 9050 MFP"
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet M3027 MFP"
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet M3035 MFP"
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet M4345 MFP"
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet M5025 MFP"
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet M5035 MFP"
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet P2010"
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet P2015"
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet P3004"
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet P3005"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4353 MF"
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4452 MF"
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr "Infotec IS2022"
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr "Infotec IS2027"
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr "Infotec IS2032"
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr "Infotec IS2035"
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr "Infotec IS2045"
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr "Infotec IS2090"
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr "Infotec IS2105"
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr "Infotec IS 2015"
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr "Infotec IS 2018"
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr "Infotec IS 2018D"
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr "Infotec IS 2060"
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr "Infotec IS 2075"
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr "Infotec IS 2122"
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr "Infotec IS 2127"
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr "Infotec IS 2132"
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr "Infotec IS 2135"
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr "Infotec IS 2145"
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr "Infotec IS 2151"
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr "Infotec IS 2160"
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr "Infotec IS 2175"
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr "Infotec IS 2215"
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr "Infotec IS 2216"
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr "Infotec IS 2220"
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr "Infotec IS 2220D"
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr "Infotec IS 2225"
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr "Infotec IS 2230"
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr "Infotec IS 2235"
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr "Infotec IS 2245"
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr "Infotec IS 2255"
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr "Infotec IS 2265"
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr "Infotec IS 2275"
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr "Infotec IS 2316"
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr "Infotec IS 2320"
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr "Infotec IS 2325"
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr "Infotec IS 2416"
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr "Infotec IS 2425"
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr "Infotec IS 2430"
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr "Infotec IS 2435"
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr "Infotec IS 2445"
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr "Infotec IS 3090"
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr "Infotec IS 3110"
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr "Infotec IS 3135"
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr "Infotec MP 2550"
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr "Infotec MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr "Infotec MP 3350"
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr "Infotec MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr "Infotec MP 4000"
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr "Infotec MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr "Infotec MP 5000"
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr "Infotec MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
+msgstr "Lanier 5622"
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
+msgstr "Lanier 5627"
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
-msgstr "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
+msgstr "Lanier 5632"
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
+msgstr "Lanier 5635"
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
-msgstr "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
+msgstr "Lanier 5645"
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
-msgstr "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
+msgstr "Lanier LD0105"
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
-msgstr "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
+msgstr "Lanier LD015"
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
-msgstr "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
+msgstr "Lanier LD035"
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
-msgstr "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
+msgstr "Lanier LD045"
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
-msgstr "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
+msgstr "Lanier LD060"
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
+msgstr "Lanier LD075"
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
+msgstr "Lanier LD090"
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
+msgstr "Lanier LD115"
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
+msgstr "Lanier LD116"
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
+msgstr "Lanier LD118"
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
+msgstr "Lanier LD118d"
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
+msgstr "Lanier LD120"
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
-msgstr "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
+msgstr "Lanier LD120d"
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
-msgstr "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
+msgstr "Lanier LD122"
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
-msgstr "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
+msgstr "Lanier LD127"
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
-msgstr "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
+msgstr "Lanier LD132"
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
-msgstr "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
+msgstr "Lanier LD135"
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
-msgstr "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
+msgstr "Lanier LD145"
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
-msgstr "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
+msgstr "Lanier LD151"
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
-msgstr "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
+msgstr "Lanier LD160"
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
-msgstr "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
+msgstr "Lanier LD175"
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
-msgstr "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
+msgstr "Lanier LD225"
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
-msgstr "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
+msgstr "Lanier LD230"
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
-msgstr "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
+msgstr "Lanier LD235"
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
-msgstr "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
+msgstr "Lanier LD245"
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
-msgstr "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
+msgstr "Lanier MP 2500"
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
-msgstr "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
+msgstr "Lanier LD125"
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
-msgstr "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
+msgstr "Lanier MP 1100"
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
-msgstr "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
+msgstr "Lanier LD1100"
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
-msgstr "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
+msgstr "Lanier MP 1350"
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
+msgstr "Lanier LD1135"
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
-msgstr "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
+msgstr "Lanier MP 1600"
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
-msgstr "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
+msgstr "Lanier LD316"
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
-msgstr "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
+msgstr "Lanier MP 161"
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
-msgstr "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
+msgstr "Lanier LD016"
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
-msgstr "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
+msgstr "Lanier MP 2000"
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
-msgstr "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
+msgstr "Lanier LD320d"
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
-msgstr "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
+msgstr "Lanier MP 2510"
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
-msgstr "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
+msgstr "Lanier LD325"
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
-msgstr "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
+msgstr "Lanier MP 2550B"
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
-msgstr "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
+msgstr "Lanier LD425B"
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
-msgstr "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
+msgstr "Lanier MP 2550"
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
-msgstr "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
+msgstr "Lanier LD425"
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
-msgstr "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
+msgstr "Lanier MP 3010"
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
-msgstr "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
+msgstr "Lanier LD330"
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
-msgstr "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
+msgstr "Lanier MP 3350B"
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
-msgstr "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
+msgstr "Lanier LD433B"
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
-msgstr "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
+msgstr "Lanier MP 3350"
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
-msgstr "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
+msgstr "Lanier LD433"
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
-msgstr "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
+msgstr "Lanier MP 3500"
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
+msgstr "Lanier LD335"
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
-msgstr "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr "Lanier MP 4000B"
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
-msgstr "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
+msgstr "Lanier LD040B"
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
-msgstr "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
+msgstr "Lanier MP 4000"
 
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
-msgstr "Star LaserPrinter 8"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr "Lanier LD040"
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
-msgstr "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
+msgstr "Lanier MP 4500"
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
-msgstr "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
+msgstr "Lanier LD345"
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
-msgstr "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
+msgstr "Lanier MP 5000B"
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
-msgstr "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
+msgstr "Lanier LD050B"
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
-msgstr "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
+msgstr "Lanier MP 5000"
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
+msgstr "Lanier LD050"
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
-msgstr "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
+msgstr "Lanier MP 5500"
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
-msgstr "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
+msgstr "Lanier LD255"
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
-msgstr "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
+msgstr "Lanier MP 6500"
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
+msgstr "Lanier LD265"
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
-msgstr "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
+msgstr "Lanier MP 7500"
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
-msgstr "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
+msgstr "Lanier LD275"
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
-msgstr "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
+msgstr "Lanier MP 9000"
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
+msgstr "Lanier LD190"
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
-msgstr "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E321"
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
-msgstr "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E323"
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
-msgstr "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
-msgstr "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
-msgstr "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
-msgstr "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
-msgstr "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
-msgstr "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
-msgstr "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
-msgstr "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
-msgstr "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
-msgstr "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
-msgstr "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
-msgstr "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
-msgstr "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr "NRG 10515"
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr "NRG 10518"
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr "NRG 10512"
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
+msgstr "NRG 2205"
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
+msgstr "NRG 2238"
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr "NRG 2212"
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
+msgstr "NRG 2705"
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr "NRG 2738"
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr "NRG 2712"
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr "NRG 3205"
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr "NRG 3238"
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr "NRG 3212"
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr "NRG 3525"
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
-msgstr "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr "NRG 3508"
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
-msgstr "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
+msgstr "NRG 3502"
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
+msgstr "NRG 3545"
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
+msgstr "NRG 3518"
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
+msgstr "NRG 3532"
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
+msgstr "NRG 4525"
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
+msgstr "NRG 4508"
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr "NRG 4502"
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
-msgstr "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
+msgstr "NRG 4545"
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
-msgstr "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
+msgstr "NRG 4518"
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
-msgstr "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
+msgstr "NRG 4532"
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
-msgstr "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
+msgstr "NRG 6002"
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
-msgstr "Kurvetype"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr "NRG 6005"
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "Er denne kurve lineær, tilpasset med interpolation eller fri-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
+msgstr "NRG 6008"
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
+msgstr "NRG 7502"
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
-msgstr "Mindst mulige værdi for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr "NRG 7505"
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "Maksimum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr "NRG 7508"
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
-msgstr "Størst mulige værdi for X"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr "NRG 9005"
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr "NRG 9008"
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
-msgstr "Mindst mulige værdi for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr "NRG 9002"
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Maksimum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
+msgstr "NRG DSm415"
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
-msgstr "Størst mulige værdi for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
+msgstr "NRG DSm615"
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "_Gamma værdi"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr "NRG DSm616"
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Tommer"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr "NRG DSm618"
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Brug tommer som basisenhed ved målangivelse"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr "NRG DSm618d"
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr "NRG DSm620"
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Brug centimeter som basisenhed ved målangivelse"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr "NRG DSm620d"
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
-msgstr "Punkter"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr "NRG DSm622"
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Brug punkter (1/72\") som basisenhed ved målangivelse"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr "NRG DSm627"
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr "NRG DSm632"
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Brug millimeter som basisenhed ved målangivelse"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr "NRG DSm635"
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr "NRG DSm645"
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Brug picas (1/12\") som basisenhed ved målangivelse"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr "NRG DSm651"
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Farveudskrift"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr "NRG DSm660"
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Print gråtoner med sort blæk"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr "NRG DSm675"
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "Standard kommando"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr "NRG DSm725"
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "Brug standarddefineret printerkommando"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
+msgstr "NRG DSm730"
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "Egendefineret kommando"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr "NRG DSm735"
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "Anvend egendefineret printerkommando"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr "NRG DSm745"
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Fil"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr "NRG MP 1100"
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "Udskriv til fil"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr "NRG MP 1350"
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
-msgstr "Ret kurve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr "NRG MP 1600"
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
-msgstr "Sæt som standard"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr "NRG MP 161"
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
-msgstr "Genskab forrige"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
+msgstr "NRG MP 2000"
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "O.k"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr "NRG MP 2500"
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Annullér"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr "NRG MP 2510"
 
-#: src/gutenprintui2/panel.c:641
-msgid "Select File..."
-msgstr "Vælg fil..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr "NRG MP 2550"
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
-msgstr "Nulstil"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
+msgstr "NRG MP 2550B"
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Udskriv v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr "NRG MP 3010"
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Om"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr "NRG MP 3350"
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
-msgstr ""
-"    Print og\n"
-"gem opsætning"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr "NRG MP 3350B"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
-msgstr ""
-"    Gem\n"
-"opsætning"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr "NRG MP 3500"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Udskriv"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr "NRG MP 4000"
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Smugkig"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr "NRG MP 4000B"
 
-#: src/gutenprintui2/panel.c:1448
-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 ""
-"Placer billedet på siden.\n"
-"Klik og træk med venstre musetaste for at placere billedet.\n"
-"Klik og træk med højre musetaste for at flytte billedet med større "
-"præcision. Hver enhed af bevægelse flytter billedet et punkt (1/72\").\n"
-"Klik og træk med midterste musetaste for at flytte billedet i enheder af "
-"billedets størrelse.\n"
-"Tryk på skift tasten når du klikker og trækker bevirker, at billedet kun "
-"flyttes i enten lodret eller vandret retning.\n"
-"Hvis du trykker på en anden musetaste mens du trækker med musen, vil "
-"billedet returnere til dets oprindelig position."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
+msgstr "NRG MP 4500"
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "Papirstørrelse"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr "NRG MP 5000"
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "Vis alle papirstørrelser"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
+msgstr "NRG MP 5000B"
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Størrelser:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr "NRG MP 5500"
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Bredde:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr "NRG MP 6500"
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Bredden af det papir der skal udskrives på"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr "NRG MP 7500"
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Højde:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr "NRG MP 9000"
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Højden af det papir der skal udskrives på"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr "Oki OL400"
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
-msgstr "Automatisk papirstørrelse"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr "Oki OL400e"
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "Antal kopier"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
+msgstr "Oki OL400ex"
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Vælg antal kopier; skal være mellem 1 og 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr "Oki OL410e"
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "Billedposition"
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr "Oki OL600e"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Auto"
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr "Oki OL610e/S"
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Portræt"
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr "Oki OL800"
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Tværformat"
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr "Oki OL810ex"
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Vendt op/ned"
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr "Oki Okipage 6e"
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Tværformat vendt op/ned"
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr "Oki Okipage 6ex"
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr ""
-"Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
-"ned"
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr "Oki Okipage 8p"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientering:"
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr "Oki Okipage 10e"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Venstre:"
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr "Oki Okipage 10ex"
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Afstand fra venstre side af arket til billedet"
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr "Oki Okipage 14ex"
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Højre:"
+#: src/xml/xmli18n-tmp.h:4943
+msgid "Oki Super 6e"
+msgstr "Oki Super 6e"
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Afstand fra venstre papiretkant til højre side af billedet"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Afstand fra højre papirkant til billedet"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Øverst:"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Afstand fra toppen af arket til billedet"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Nederst:"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Afstand fra toppen af arket til bunden af billedet"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Afstand fra den nederste kant af arket til billedet"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centrér:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "Vandret"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 1022"
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centrér billedet i vandret på papiret"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 1027"
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Begge"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 1032"
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centrér billedet på papiret"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 1035"
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "Lodret"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 1045"
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centrér billedet i lodret på papiret"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 1060"
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Indstil printer"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 1075"
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
-msgstr "Printer mærke:"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 1515"
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
-msgstr "Vælg dit printermærke"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 2015"
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Printermodel:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 2016"
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Vælg din printermodel"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 2018"
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD-fil:"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 2018D"
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Angiv korrekt PPD filnavn for printeren"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 2020"
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Bladr igennem"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 2020D"
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Vælg korrekt PPD filnavn for printeren"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 2022"
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr ""
-"Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
-"ønsker at printe til"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 2027"
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "Printerkø:"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 2032"
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "Angiv den korrekte kommando til printning på din printer. "
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 2035"
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "Angiv hvilken fil du vil skrive til. "
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 2035e"
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
-msgstr "Fil der skal skrives til"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 2045"
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "Udskriv til fil"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 2045e"
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Definér ny printer"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 2051"
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Printernavn:"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 2060"
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Angiv et navn til denne logiske printer"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 2075"
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "Om Gutenprint"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 2090"
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Gutenprint version"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 2105"
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Printer indstillinger"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr ""
-"Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
-"at udskrive til"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 3025"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Opsætning printer..."
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 3030"
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr ""
-"Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
-"denne printer"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 3035"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Ny printer..."
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 3045"
 
-#: src/gutenprintui2/panel.c:2093
-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 ""
-"Definer en ny logisk printer. Dette kan bruges til at navngive en samling af "
-"indstillinger, som du ønsker at huske til senere brug."
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2123
-msgid "Set Printer Option Defaults"
-msgstr "Sæt printerindstilling til standardværdier"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
-msgstr "Sæt alle printerindstillinger til standardværdier"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio MP 1100"
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "Billedstørrelse"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio MP 1350"
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Skalering:"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio MP 1600"
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Angiv skalering (størrelse) af billedet"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio MP 161"
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Skalér med:"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio MP 2000"
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr ""
-"Vælg om skalering måles i procent af valgt arkstørrelse, eller antal af "
-"udskriftspunkter pr. tomme"
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio MP 2500"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Procent"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio MP 2510"
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Skalér udskriften til arkstørrelsen"
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio MP 2550"
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio MP 2550B"
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Skalér udskriften til antal punkter pr. tomme"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio MP 3010"
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Angiv bredden af udskriften"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio MP 3350"
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Angiv højden på udskriften"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio MP 3350B"
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr ""
-"Brug original\n"
-"billedstørrelse"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio MP 3500"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio MP 4000"
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Udskrifts-farvejustering"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio MP 4000B"
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Sæt til standardværdier"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio MP 4500"
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Luk"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio MP 5000"
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Smugkig af billede"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio MP 5000B"
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
-msgstr "Vis udskriftskanaler:"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio MP 5500"
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
-msgstr "Udskrift"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio MP 6500"
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Udskriftstype:"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio MP 7500"
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Vælg den ønskede udskriftstype"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio MP 9000"
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Justér udskrift..."
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-1250"
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "MÃ¥l-enhed:"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-1450"
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
-msgstr " "
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-1450PS"
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Enheder:"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-1650"
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Vælg basisenhed for målangivelse ved printning"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-1651N"
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-1750"
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-2150"
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-2150PS"
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-2151N"
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-2151NPS"
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-2152W"
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-2152WPS"
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "Printer"
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-2250"
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(Standard printer)"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-2550"
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "Printer egenskaber"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-2551N"
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
-msgstr "Udskriftskontrol"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-2552W"
 
-#: src/cups/genppd.c:151
-msgid "Common"
-msgstr "Almindelig"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
-msgstr "Ekstra 1"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
-msgstr "Ekstra 2"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
-msgstr "Ekstra 3"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
-msgstr "Ekstra 4"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
-msgstr "Ekstra 5"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
 
-#. 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:1064
-msgid "English"
-msgstr "Danish"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
-msgstr "2-sidet udskrivning"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7300"
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
-msgstr "Formindsk side så den passer til kanter"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7300N"
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
-msgstr "Formindsk (udskriv hele siden)"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
-msgstr "Beskær (bevar format)"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
-msgstr "Udvid (brug hele arket)"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr "Savin 2522"
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "Nej"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr "Savin 2527"
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "Ja"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr "Savin 2532"
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
-msgstr "Værdi"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
+msgstr "Savin 2535"
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
-msgstr "Finjustering"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr "Savin 2235"
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil version "
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr "Savin 2545"
 
-#: 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-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Dette program er fri software; du kan redistribuere det og/eller modificere "
-"det\n"
-"under bestemmelserne i the GNU General Public License som offentliggjort af\n"
-"the Free Software Foundation; enten version 2 af licensen, eller (efter dit "
-"valg)\n"
-"enhver senere version.\n"
-"\n"
-"Dette program er distribueret i det håb, at det vil være nyttigt, men\n"
-"UDEN ENHVER FOR FOR GARANTI, endda uden den underforståede\n"
-"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n"
-"Se GNU General Public License for yderligere detaljer.\n"
-"\n"
-"Du skulle have modtaget en kopi af GNU General Public License sammen\n"
-"med dette program. Hvis ikke, skriv da til Free Software Foundation, Inc .,\n"
-"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr "Savin 2245"
 
-#: 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 ""
-"Brug: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C valg] [-p mønstre]\n"
-"Udfører vedligeholdelse på EPSON Stylus (R) printere.\n"
-"Eksempler: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name på min-kø\n"
-"\n"
-"  Kommandoer:\n"
-"    -c|--clean-head    Renser print hoved.\n"
-"    -n|--nozzle-check  Printer et dyse-test mønster.\n"
-"                       Beskidte eller stoppede dyser viser sig som huller i\n"
-"                       mønsteret. Hvis der er huller, bør du rense\n"
-"                       print hovedet.\n"
-"    -a|--align-head    Retter printhovedet ind.    FORSIGTIG     forkert "
-"brug\n"
-"                       af denne funktion kan resultere i dårlig "
-"printkvalitet, og/eller\n"
-"                       forårsage direkte skade på printeren.\n"
-"    -s|--status        Viser printer status.\n"
-"    -i|--ink-level     Henter blæk niveau fra printeren. Dette kræver\n"
-"                       direkte læse/skrive adgang til printeren.\n"
-"    -e|--extended-ink-info     Henter udvidet information om blæk niveau "
-"fra\n"
-"                        printeren. Dette kræver direkte læse/skrive adgang "
-"til printeren.\n"
-"    -d|--identify      Forespørger printer om fremstiller og model.Dette\n"
-"                       kræver direkte læse/skrive adgang til printeren.\n"
-"    -l|--license       Viser licens/garanti bestemmelser for dette program.\n"
-"    -M|--list-models   Lister de tilgængelige printermodeller.\n"
-"    -h|--help          Printer denne hjælpe meddelelse.\n"
-"  Indstillinger:\n"
-"    -P|--printer-name  Specificer den valgte printerkø.\n"
-"                       Uden angivelse = system printeren lp.\n"
-"    -r|--raw-device    Specificer navnet på den enhed der skrives til "
-"direkte\n"
-"                       i stedet for at gå gennem en printerkø.\n"
-"    -m|--model         Specificer den præcise printermodel.\n"
-"    -u|--new           Printeren er ny (Stylus Color 740 eller nyere).\n"
-"                       Bruges kun når der ikke anvendes direkte adgang.\n"
-"    -q|--quiet         Undertrykker banneret.\n"
-"    -S|--short-name    Printer kort-navn for printer med --identify.\n"
-"    -C|--choices       Angiv antallet af mønstre, ved printerhoved retten "
-"ind.\n"
-"    -p|--patterns      Angiv antallet af sæt af mønstre, ved printerhoved "
-"retten ind.\n"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
+msgstr "Savin 2560"
 
-#: 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 ""
-"Brug: escputil [Indstillinger] [Kommandoer]\n"
-"Brug: escputil [-c | -n | -a | -i -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C valg] [-p mønstre]\n"
-"Udfør vedligeholdelse på EPSON Stylus (R) printere.\n"
-"Eksempler: escputil -c -u -P min-kø\n"
-"          escputil -i -r /dev/usb/lp0\n"
-"\n"
-"  Kommandoer:\n"
-"    -c Renser print hoved.\n"
-"    -n Printer en dyse test.\n"
-"          Beskidte eller stoppede dyser viser sig som huller i\n"
-"          mønsteret. Hvis der er huller, bør du rense\n"
-"          print hovedet.\n"
-"    -a Retter printhovedet ind.    FORSIGTIG     forkert brug\n"
-"          af denne funktion kan resultere i dårlig printkvalitet, eller\n"
-"          forårsage direkte skade på printeren.\n"
-"    -s Viser printer status.\n"
-"    -i Henter blæk niveau fra printeren. Dette kræver\n"
-"          direkte læse/skrive adgang til printeren.\n"
-"    -e Hent udvidede blæk-informationer fra printeren.\n"
-"          Kun for R800 printeren, eller tilsvarende. Dette kræver\n"
-"          direkte læse/skrive adgang til printeren.\n"
-"    -d Forespørger printer om fremstiller og model.Dette\n"
-"          kræver direkte læse/skrive adgang til printeren.\n"
-"    -l Viser licens/garanti bestemmelser for dette program.\n"
-"    -M Lister de tilgængelige printermodeller.\n"
-"    -h Printer denne hjælpe meddelelse.\n"
-"  Indstillinger:\n"
-"    -P Specificer den valgte printerkø.\n"
-"          Uden angivelse = system printeren lp.\n"
-"    -r Specificer navnet på den enhed der skrives til direkte\n"
-"         i stedet for at gå gennem en printerkø.\n"
-"    -u Printeren er ny (Stylus Color 740 eller nyere).\n"
-"        Kun nødvendigt hvis der bruges andet end en printer med\n"
-"        direkte læse/skrive adgang.\n"
-"    -q Undertrykker banneret.\n"
-"    -S Printer kort-navn for printer med -d.\n"
-"    -m Specificer den præcise printermodel til brug for\n"
-"           indretning af printhoved (alignment).\n"
-"    -C Angiv antallet af mønstre, ved printerhoved retten ind.\n"
-"    -p Angiv antallet af sæt af mønstre, ved printerhoved retten ind.\n"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
+msgstr "Savin 2575"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Du kan kun specificere en printer eller en ufiltreret enhed."
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
+msgstr "Savin 3515"
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Du kan kun specificere en printermodel."
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
+msgstr "Savin 40105"
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
-msgstr "Retten-ind valg skal mindst være 1."
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
+msgstr "Savin 4015"
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
-msgstr "Retten-ind gennemløb skal være mindst 1."
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
+msgstr "Savin 4018"
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Ukendt indstilling %c\n"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr "Savin 4018d"
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Brug: %s [Indstillinger] kommando\n"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr "Savin 4022"
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
-msgstr "Tast `%s --help' for yderligere information.\n"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr "Savin 4027"
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
-msgstr "Tast `%s -h' for yderligere information.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
+msgstr "Savin 4035"
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Kan ikke åbne enheden %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr "Savin 4135g"
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Kan ikke printe til printer %s med %s\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr "Savin 4035e"
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Er ikke i stand til at sende kommando til printeren\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr "Savin 4135eG"
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
-msgstr "Læsning fra printer overskred tidsgrænsen\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr "Savin 4045"
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Kan ikke læse fra %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr "Savin 4145g"
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
-msgstr "Angiv en ufiltreret enhed\n"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr "Savin 4045e"
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan ikke åbne %s læse/skrive: %s\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr "Savin 4145eG"
 
-#: src/escputil/escputil.c:783
-#, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Ukendt printer %s!\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr "Savin 4051"
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Kan ikke skrive til %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
+msgstr "Savin 4060"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
-msgstr ""
-"\n"
-"Kan ikke skrive til %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr "Savin 4075"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
-msgstr ""
-"\n"
-"Kan ikke detektere printertype.\n"
-"Brug -m for at specificere din printermodel.\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr "Savin 4090"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "Ukendt"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr "Savin 7025"
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
-msgstr "Status: Fejl\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr "Savin 8016"
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
-msgstr "Status: Selv-printning\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
+msgstr "Savin 8020"
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
-msgstr "Status: Optaget\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr "Savin 8020d"
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
-msgstr "Status: Venter\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr "Savin 8025"
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
-msgstr "Status: Ledig\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr "Savin 8025e"
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr "Status: Sat til pause\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr "Savin 8030"
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
-msgstr "Status; Renser\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr "Savin 8030e"
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
-msgstr "Status: Fabriksindstillet\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
+msgstr "Savin 8035"
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr "Status: Lukker ned\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
+msgstr "Savin 8035g"
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
-msgstr "Status Ukendt (%d)\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
+msgstr "Savin 8035e"
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
-msgstr "Fejl: Fatal fejl\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
+msgstr "Savin 8045"
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
-msgstr "Fejl: Anden tilslutning valgt\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
+msgstr "Savin 8045g"
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
-msgstr "Fejl: Låg åbent\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
+msgstr "Savin 8045e"
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
-msgstr "Fejl: Papir problemer\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr "Savin 8055"
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
-msgstr "Fejl: Blæk slut\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
+msgstr "Savin 8065"
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
-msgstr "Fejl: Papir slut\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
+msgstr "Savin 8075"
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
-msgstr "Fejl: Afvent returnering fra afrivningsposition\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
+msgstr "Savin 8090"
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
-msgstr "Fejl: Dobbeltfødningsfejl\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
+msgstr "Savin 8110"
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
-msgstr "Fejl: Uoprettelig papirskærerfejl\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
+msgstr "Savin 8135"
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
-msgstr "Fejl: Genoprettelig papirskærerproblem\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
+msgstr "Savin 816"
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
-msgstr "Fejl: CD-skuffe tom\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
+msgstr "Savin 9016"
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
-msgstr "Fejl: Kortlæsningsfejl\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
+msgstr "Savin 9021d"
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
-msgstr "Fejl: Skuffelåg åben\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
+msgstr "Savin 9025"
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
-msgstr "Fejl: Ukendt (%d)\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
+msgstr "Savin 9025b"
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
-msgstr "Printer dyse selv-test\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr "Savin 9033"
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
-msgstr "Blækniveauer:\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr "Savin 9033b"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Blæk farve"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
+msgstr "Savin 9040"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Procent tilbage"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
+msgstr "Savin 9040b"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
-msgstr "Advarsel: Sort blækniveau lavt\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
+msgstr "Savin 9050"
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
-msgstr "Advarsel: Ukendt (%d)\n"
-
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
-msgstr "Job-navn: "
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr "Savin 9050b"
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
-msgstr "blækniveauer"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "status"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr ""
-"Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
-msgstr "Blækpatron"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr "Star LS-04"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
-msgstr "Del nummer"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "Dato"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
+msgstr "Tally MT908"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Kan ikke identificere printermodel.\n"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Renser hoveder...\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
 
-#: src/escputil/escputil.c:1728
-#, 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/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
 
-#: src/escputil/escputil.c:1732
-#, 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 ""
-"Læs disse instruktioner grundigt før du fortsætter.\n"
-"\n"
-"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
-"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
-"i print kvalitet, og sandsynligvis skade din printer. Denne funktion er "
-"ikke\n"
-"blevet testet af Seiko Epson for korrekt funktion, og tilbydes uden nogen\n"
-"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
-"regning og risiko.\n"
-"\n"
-"Denne funktion printer %d test mønstre. Hvert mønster ser ens ud.\n"
-"Mønstrene består af en serie af lodrette liniepar der overlapper.\n"
-"Under hvert liniepar er der et nummer mellem %d og %d.\n"
-"\n"
-"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
-"rettet-ind, d.v.s. det par der bedst danner en ret linie.\n"
-"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
-"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
-"par.\n"
-"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne\n"
-"er præcist formede og ikke 'løber ud' i papiret.\n"
-"Når du har valgt det flotteste par, og har noteret tallet under, lægges\n"
-"papiret i printeren igen, inden tallet indtastes.\n"
-"\n"
-"Hvert mønster er identisk, men senere mønstre anvender en finere dot\n"
-"for en mere kritisk retten-ind. Du skal køre alle gennemløbene for at opnå\n"
-"en perfekt retten-ind af din printer. Når du har kørt alle gennemløbene, "
-"bliver\n"
-"mønsteret printet igen. Nu skal det midterste af parrene (#%d ud af de %d)\n"
-"være det bedste.\n"
-"\n"
-"NÃ¥r dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
-"gentage(r) processen, eller afbryde(q) uden at gemme. NÃ¥r du afbryder,\n"
-"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
-"for\n"
-"printeren. Det er derfor vigtigt at der ikke bliver slukket for printeren "
-"mens\n"
-"processen løber.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/escputil/escputil.c:1767
-#, 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 ""
-"Læs disse instruktioner grundigt før du fortsætter.\n"
-"\n"
-"Denne funktion lader dig rette print hovedet ind, på din Epson Stylus\n"
-"inkjet printer. Forkert anvendelse af funktionen kan forårsage reduktion\n"
-"i print kvalitet, og sandsynligvis skade din printer. Denne funktion er "
-"ikke\n"
-"blevet testet af Seiko Epson for korrekt funktion, og tilbydes uden nogen\n"
-"former for garanti i det hele taget. Brug af funktionen er derfor på egen\n"
-"regning og risiko.\n"
-"\n"
-"Denne funktion printer et test mønster der består af en serie af\n"
-"lodrette liniepar der overlapper.\n"
-"Under hvert liniepar er der et nummer mellem %d og %d.\n"
-"\n"
-"Når du undersøger linieparrene, skal du finde det liniepar, der er bedst\n"
-"rettet-ind, d.v.s. det par der bedst danner en ret linie.\n"
-"Undersøg parrene meget omhyggeligt for at finde det bedste match. Det\n"
-"anbefales at bruge en lup eller et forstørrelsesglas for at finde det bedste "
-"par.\n"
-"Det kan også anbefales at bruge et kvalitetspapir til testen, så linierne "
-"er\n"
-"præcist formede og ikke 'løber ud' i papiret.\n"
-"Når du har valgt det flotteste par, og har noteret tallet under, lægges "
-"papiret\n"
-"i printeren igen, inden tallet indtastes.\n"
-"\n"
-"Når du har kørt retten-ind mønsteret, bliver det printet igen. Nu skal det\n"
-"midterste af parrene (#%d ud af de %d) være det bedste.\n"
-"\n"
-"NÃ¥r dette er sket, har du mulighed for at gemme(s) resultatet i printeren,\n"
-"gentage(r) processen, eller afbryde(q) uden at gemme. NÃ¥r du afbryder,\n"
-"bliver den hidtidige indstilling ikke genskabt, før der har været slukket "
-"for\n"
-"printeren. Det er derfor vigtigt at der ikke bliver slukket for printeren "
-"mens\n"
-"processen løber.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
 
-#: src/escputil/escputil.c:1811
-#, 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/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
-msgstr "Afbryder\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
 
-#: src/escputil/escputil.c:1828
-#, 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 ""
-"Kontroller det endelige udskrift meget omhyggeligt, for at sikre dig,\n"
-"at din printer er korrekt rettet-ind. Du kan nu:\n"
-"  (s) gemme resultatet i printeren,\n"
-"  (q) afbryde uden at gemme noget, eller\n"
-"  (r) gentage hele processen forfra.\n"
-"Du vil så blive bedt om at bekræfte dit valg.\n"
-"Hvad vil du gøre (s, q, r)?\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
 
-#: src/escputil/escputil.c:1843
-#, 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/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
 
-#: src/escputil/escputil.c:1850
-#, c-format
-msgid ""
-"OK, your printer is aligned, but the alignment has not been saved.\n"
-"If you wish to save the alignment, you must repeat this process.\n"
-msgstr ""
-"O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n"
-"Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Gentager processen med at retten-ind.\n"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1871
-#, 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 ""
-"Dette vil blivende ændre konfigurationen af din printer.\n"
-"ADVARSEL: denne procedure er ikke blevet godkendt af Seiko Epson,\n"
-"og det kan skade din printer. Fortsæt?\n"
-"Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
-"printer:\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Klar til at gemme indstillingerne..."
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "mislykkedes!\n"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
-msgstr ""
-"Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
-"processen.\n"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "lykkedes!\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#: src/escputil/escputil.c:1895
-#, 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/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Kommandoen blev ikke genkendt.\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Afsluttende kommando blev ikke bekræftet.\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
 
-#: src/escputil/escputil.c:1908
-#, 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 ""
-"Denne procedure går ud fra, at din printer er en %s.\n"
-"Hvis dette ikke er din printermodel, tast ctrl-C nu, og vælg\n"
-"din aktuelle printermodel.\n"
-"\n"
-"Placer et ark papir i printeren, og begynd retten-ind\n"
-"processen af print hovedet.\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Tryk på enter-tasten for at fortsætte > "
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
 
-#: src/escputil/escputil.c:1984
-#, c-format
-msgid ""
-"Please inspect the print, and choose the best pair of lines in each "
-"pattern.\n"
-"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
-msgstr ""
-"Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n"
-"Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Gennemløb #%d"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Indsæt et nyt ark papir.\n"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Antal uden for givet område!\n"
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Jeg kan ikke tolke hvad du tastede!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Prøver at sætte retten-ind..."
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "lykkedes.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
 
-#: src/escputil/escputil.c:2046
-#, 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 ""
-"Kontroller at retten-ind er korrekt. Efter retten-ind mønsteret er printet "
-"igen,\n"
-"skal du sikre dig, at det bedste mønster for hver linie er mønster %d.\n"
-"Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
-"bedste kvalitet i printning.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Fejl i inddata\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Udskriver..."
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
 
-#~ msgid ""
-#~ "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
-#~ "  does not match the PPD file (%s).  If you have upgraded your version\n"
-#~ "  of Gutenprint recently, you must reinstall all printer queues.\n"
-#~ "  Please refer to your vendor's documentation or the ``foomatic-"
-#~ "ppdfile''\n"
-#~ "  command for instructions.\n"
-#~ "ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) "
-#~ "does not match the PPD file (%s).\n"
-#~ msgstr ""
-#~ "ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n"
-#~ "  matcher ikke PPD filen (%s). Hvis du har opgraderet din version af\n"
-#~ "  Gutenprint for nyligt, skal du geninstallere alle printerkøer.\n"
-#~ "  Se i distributionsvejledningen eller brug ``foomatic-ppdfile''\n"
-#~ "  kommandoen for anvisninger.\n"
-#~ "ERROR: ijsgutenprint: den installerede version af Gutenprint softwaren (%"
-#~ "s)\n"
-#~ "  matcher ikke PPD filen (%s).\n"
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
 
-#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-#~ msgstr ""
-#~ "ERROR: ijsgutenprint: Fejlagtigt farveområde: bps %d kanaler %d område %"
-#~ "s\n"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
 
-#~ msgid "ERROR: ijsgutenprint: No row buffer\n"
-#~ msgstr "ERROR: ijsgutenprint: Ingen række buffer\n"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
 
-#~ msgid ""
-#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-#~ msgstr ""
-#~ "ERROR: ijsgutenprint: Kan ikke fortolke parameter %s=%s (forventer et "
-#~ "nummer)\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-720"
 
-#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-#~ msgstr "ERROR: ijsgutenprint: Printer skal specificeres med -sDeviceModel\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-730"
 
-#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-#~ msgstr "ERROR: ijsgutenprint: Printer %s er ikke en kendt model\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-740"
 
-#~ msgid "ijsgutenprint: unknown DeviceModel %s\n"
-#~ msgstr "ijsgutenprint: ukendt DeviceModel %s\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-750"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-#~ msgstr "ERROR: ijsgutenprint: kan ikke fortolke TopLeft %s\n"
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY ES1"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke PaperSize %s\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY ES2"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke kurve %s\n"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY ES20"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s flyde %s\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s int %s\n"
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s dimension %s\n"
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s boolean %s\n"
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
 
-#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-#~ msgstr "ERROR: ijsgutenprint: Forkert parameter %s %d\n"
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
 
-#~ msgid "ERROR: ijsgutenprint: bad key code %d\n"
-#~ msgstr "ERROR: ijsgutenprint: forkert nøglekode %d\n"
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-#~ msgstr "ERROR: ijsgutenprint: image_init fejlede %d\n"
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Ikke i stand til at åbne filbeskriver: %s\n"
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
 
-#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Ikke i stand til at åbne %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare-Printer-Dock"
 
-#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Ukendt printer %s\n"
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
 
-#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-#~ msgstr "ERROR: ijsgutenprint: Forkerte parametre; kan ikke fortsætte!\n"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr "RAW DATA 16 bit"
 
-#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-#~ msgstr "ERROR: ijsgutenprint: Hentning af næste række fejlede ved %.0f\n"
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr "RAW DATA 8 bit"
diff --git a/po/de.gmo b/po/de.gmo
index bf6298d..76e5c37 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 9c3cc73..ee43cb4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2002-09-05 21:20MET\n"
 "Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
 "Language-Team: deutsch <gnome-de@gnome.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Zurücksetzen"
@@ -96,18 +96,19 @@ msgstr ""
 msgid "Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -165,9 +166,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Raster Algorythmus"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Größe"
@@ -176,320 +177,367 @@ msgstr "Größe"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Drucker Einstellungen"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Größe des Papiers "
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Medium Quelle"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "in welchem Schacht ist das Druckmedium"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Bildgröße an Seitengröße anpassen"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Auflösung"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tintentype"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tintenart im Drucker"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Druckermodel:"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+#, fuzzy
+msgid "Print Quality"
+msgstr "720 DPI höchste Qualität"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "helles Magenta"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Auto"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Schwarz-Weiß"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Ausgabeart:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -524,9 +572,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Drucken"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -543,11 +590,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -613,7 +660,7 @@ msgid "Output image type"
 msgstr "Ausgabeart:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -681,16 +728,56 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -699,16 +786,56 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -717,16 +844,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Gelb"
 
@@ -735,9 +902,11 @@ msgstr "Gelb"
 msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -746,7 +915,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -755,9 +924,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -767,16 +937,54 @@ msgid "Adjust the blue gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Schwarz"
 
@@ -785,7 +993,7 @@ msgstr "Schwarz"
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -800,7 +1008,7 @@ msgstr "Graustufen"
 msgid "Adjust the cyan gray balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -810,7 +1018,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Stellen sie die Gelb-Balance ein"
@@ -842,10 +1050,11 @@ msgstr "Tintentype"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Ausgabeart:"
@@ -854,27 +1063,27 @@ msgstr "Ausgabeart:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1020,505 +1229,570 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s ist kein erlaubter Parameter von %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unbekannter Drucker %s\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s Bereichsüberschreitung (Wert %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Die Bildgröße stimmt nicht\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Der obere Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Der linke Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Der linke Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Der obere Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
-msgid "Print Quality"
-msgstr "720 DPI höchste Qualität"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tintentype"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Abbruch"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Cyan"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Stellen sie die Gelb-Balance ein"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Empfindlichkeit:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Stellen sie die Gelb-Balance ein"
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Graustufen"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Graustufen"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Graustufen"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Ausgabeart:"
+msgid "Paper Thickness"
+msgstr "Größe"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Zurücksetzen"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Empfindlichkeit:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Druckermodel:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Normalpapier"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
 
@@ -1571,129 +1845,356 @@ msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Vier Farben Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Aus drei Farben gemischt"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Sechs Farben Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Foto aus fünf Farben gemischt "
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Normalpapier"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Folie"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Umschlag"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford schweres Papier"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Anderes"
 
@@ -1709,177 +2210,202 @@ msgstr "Handeinzug mit Pause"
 msgid "Manual without Pause"
 msgstr "Handeinzug ohne Pause"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "Mattes Papier"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Einfach"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Fett"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Hochglanz"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Folie"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Schnelltrocknendes Glossy"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Schnelltrocknende Folie"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Schacht 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Schacht 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Schacht 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Schacht 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "optionale Papierzuführung"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "eingebaute Papierzuführung"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Schacht"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "sonstige Zuführung"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI monochrome"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Höhe:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Farbe+Schwarz Patrone"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Farb + Foto Patronen"
 
@@ -1888,6482 +2414,9950 @@ msgstr "Farb + Foto Patronen"
 msgid "PPDFile"
 msgstr "PPD Datei:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Datei?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Abbruch"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
-msgid "Image dimensions must match paper dimensions"
+#: src/main/print-ps.c:316
+msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "zweistufig Grau"
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "zweistufig Grau"
+msgid "Custom"
+msgstr "Auto"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/print-raw.c:225
+msgid "Image dimensions must match paper dimensions"
+msgstr ""
 
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
 #, fuzzy
-msgid "Four Color Photo"
+msgid "Super Photo"
+msgstr "Sieben Farb Foto"
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+#, fuzzy
+msgid "Ultra Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Aus sechs Farben gemischt "
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+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/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
+#: src/main/generic-options.c:49
 #, fuzzy
-msgid "Seven Color Photo"
-msgstr "Sechs Farben Foto"
+msgid "Photograph"
+msgstr "Foto"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Aus sieben Farben gemischt"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Strichzeichnung"
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:55
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Sechs Farben Foto"
+msgid "Page"
+msgstr "Größe"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "einfarbige Rohausgabe"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr ""
 
-#: src/main/escp2-channels.c:1914
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Aus sieben Farben gemischt"
+msgid "Image Type"
+msgstr "Bildtype:"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "zweifarbige Rohausgabe"
+#: src/main/generic-options.c:69
+#, fuzzy
+msgid "Type of image being printed"
+msgstr "Tintenart im Drucker"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Siebenfarbige Rohausgabe"
+msgid "Page Number"
+msgstr "Größe"
 
-#: src/main/escp2-channels.c:1981
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Siebenfarbige Rohausgabe"
+msgid "Page number"
+msgstr "Größe"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "vierfarbige Rohausgabe"
+#: src/gutenprintui2/curve.c:130
+#, fuzzy
+msgid "Curve type"
+msgstr "Schwarz"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Zoll"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Stelle die Basismaßeinheit auf Zoll"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Die Basiseinheit auf Zentimeter einstellen"
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "vierfarbige Rohausgabe"
+msgid "Points"
+msgstr "Drucken"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Siebenfarbige Rohausgabe"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Sechsfarbige Rohausgabe"
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Aus sechs Farben gemischt "
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Siebenfarbige Rohausgabe"
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Aus sieben Farben gemischt"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Stelle die Basismaßeinheit auf Zoll"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Farbausgabe"
 
-#: src/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Drucke Graustufen nur mit schwarzer Tinte"
+
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Sechsfarbige Rohausgabe"
+msgid "Standard Command"
+msgstr "Standard"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Sechs Farben Foto"
+msgid "Custom Command"
+msgstr "Befehl:"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: 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 "Datei"
+
+#: src/gutenprintui2/panel.c:307
+#, fuzzy
+msgid "Print to a file"
+msgstr "Drucke in Datei?"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/gutenprintui2/panel.c:534
+#, fuzzy
+msgid "Set Default"
+msgstr "Zurücksetzen"
+
+#: 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 "OK"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Abbruch"
+
+#: src/gutenprintui2/panel.c:642
+#, fuzzy
+msgid "Select File..."
+msgstr "Drucker einrichten..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Drucke v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Über"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Drucke und\n"
+"Sichere die Einstellungen"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Sichere\n"
+"die Einstellungen"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Drucken"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Vorschau"
+
+#: 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 ""
+"Position des Bildes in der Seite.\n"
+"Mit der linken Maustaste verschieben sie das Bild.\n"
+"Mit der rechten geht es feiner; jede Bewegung verschiebt das Bild um einen "
+"Punkt (1/72\")\n"
+"Die mittlere verschiebt das Bild in Relation zur seiner Größe\n"
+"Wenn sie dabei die Umschalttaste (Shift) gedrückt halten, verschieben sie "
+"entweder nur waagerecht oder nur senkrecht\n"
+"Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
+"in seine Ausgangsposition zurück."
+
+#: src/gutenprintui2/panel.c:1522
+#, fuzzy
+msgid "Paper Size"
+msgstr "Größe"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Maße:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Breite:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Breite des Papiers"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Höhe:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Höhe des Papiers"
+
+#: src/gutenprintui2/panel.c:1577
+#, fuzzy
+msgid "Automatic Paper Size"
+msgstr "Größe"
+
+#: 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
+#, fuzzy
+msgid "Image Position"
+msgstr "Position"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Aufrecht"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Querformat"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "umgekehrt Aufrecht"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "umgekehrt Querformat"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
+"umgekehrt Querformat"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Ausrichtung:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "links:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Entfernung vom linken Blattrand Bildrand"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "rechts:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Entfernung vom linken Blattrand zum rechten Bildrand"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Entfernung vom rechten Blattrand zum Bildrand"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Oben:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Entfernung vom oberen Blattrand zum Bildrand"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "unten:"
+
+#: src/gutenprintui2/panel.c:1696
+#, fuzzy
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Entfernung vom oberen Blattrand zum unteren Bildrand"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Entfernung vom unteren Blattrand zum Bild"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Zentrieren:"
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "Waagerecht"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Bild waagerecht auf dem Blatt zentrieren"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Beides"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Bild auf dem Blatt zentrieren"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "senkrecht"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Bild senkrecht auf dem Blatt zentrieren"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Drucker einrichten"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "Drucker Name:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "Wählen sie ihr Druckermodel"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Druckermodel:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Wählen sie ihr Druckermodel"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD Datei:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Suchen"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+
+#: 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 ""
+"Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
+"Modell...)"
+
+#: src/gutenprintui2/panel.c:1914
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "Drucker Name:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "Probeausdruck"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "Drucke in Datei?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Neuen Printer einrichten"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Drucker Name:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an."
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "Über Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Gimp-Print Version "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Drucker Einstellungen"
+
+#: 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 ""
+"Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
+"Modell...)"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Drucker einrichten..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
+"diesem Drucker"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "neuer Drucker..."
+
+#: 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 ""
+"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
+"einen Namen geben und später unter diesem einfach aufrufen."
+
+#: src/gutenprintui2/panel.c:2150
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Zurücksetzen"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Größe"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Zoom:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Einstellung der Bildgröße"
+
+#: 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 ""
+"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
+"sollen"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Prozent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Bildgröße an Seitengröße anpassen"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Einstellen der Breite des Ausdrucks"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Einstellen der Höhe des Ausdrucks"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Benutze originale\n"
+"Bildgröße"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Ausdruckgröße gleich Bildgröße"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Farbabstimmung"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Zurücksetzen"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Schließen"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Vorschau"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Ausgabeart:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Ausgabeart:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Wählen sie die gewüschte Ausgabeart:"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Ausgabeeinstellungen.."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
+
+#: src/gutenprintui2/panel.c:2523
+#, fuzzy
+msgid "Size Units:"
+msgstr "Einheiten:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+msgid " "
+msgstr "> "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Einheiten:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Wählen sie die Basismaßeinheit für das Drucken"
+
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Drucken"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Drucker einrichten"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Drucker Einstellungen"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Ausgabeart:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Befehl:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "Schacht 1"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "Schacht 2"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "Schacht 3"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "Schacht 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "German"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Papier Größe:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Farbe"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Graustufen"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Farbe"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY Farbe"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil Version "
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Dieses Programm ist freie Software. Sie können es unter\n"
+"    den Bedingungen der GNU General Public License, wie von der\n"
+"    Free Software Foundation herausgegeben, weitergeben und/oder\n"
+"    modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n"
+"    Sie es wünschen) jeder späteren Version.\n"
+"    Die Veröffentlichung dieses Programms erfolgt in der\n"
+"    Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n"
+"    GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n"
+"    der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK\n"
+".    Details finden Sie in der GNU General Public License.\n"
+"    Sie sollten eine Kopie der GNU General Public License zusammen\n"
+"    mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n"
+"    an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
+"    MA 02139, USA.\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-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 ""
+"Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
+"Perform maintenance on EPSON Stylus ® printers \n"
+" Beispiel: escputil --clean-head --printer stpex-on-third-floor\n"
+"          escputil --ink-level --new --raw-device /dev/lp0\n"
+"\n"
+"   Kommandos:\n"
+"    -c|--clean-head    Druckköpfe reinigen.\n"
+"    -n|--nozzle-check  Testausdruck.\n"
+"                       Schmutzige oder verklebte Düsen sind\n"
+"                         als Aussetzer erkennbar. Wenn diese auftreten, \n"
+"                        sollten sie die Köpfe reinigen\n"
+"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
+"                       Benutzung dieser Option kann eine schlechte "
+"Druckqualität\n"
+"                       oder Druckerschäden verursachen.\n"
+"    -o|--align-color    Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n"
+"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
+"                       Option kann eine schlechte Druckqualität oder\n"
+"                       Druckerschäden verursachen.\n"
+"    -s|--status        Zeigt den Drucker Status.\n"
+"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
+"                         Leserechte auf die Drucker-Schnittstelle. \n"
+"    -d|--identify      Fragt die Modelinformationen ab.\n"
+"                       Benötigt Schreib- und Leserechte auf die Drucker-"
+"Schnittstelle \n"
+"                       Drucker-Schnittstelle.\n"
+"    -l|--license       Zeigt die Lizenz- und Garantiebedingungen dieses "
+"Programmes\n"
+"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
+"    -h|--help          Zeigt diese Informationen an.\n"
+"  Optionen:\n"
+"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
+"                       ohne Angabe = Systemdrucker lp\n"
+"    -r|--raw-device    Gibt die Druckerschnittstelle an.\n"
+"                       Vorsicht-geht nicht durch die Schleife\n"
+"    -u|--new           Der Drucker ist neu (Stylus Colour 740 or\n"
+"                       neuer).\n"
+"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
+"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
+
+#: src/escputil/escputil.c:162
+#, fuzzy
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\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 ""
+"Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
+"Perform maintenance on EPSON Stylus ® printers \n"
+" Beispiel: escputil --clean-head --printer stpex-on-third-floor\n"
+"          escputil --ink-level --new --raw-device /dev/lp0\n"
+"\n"
+"   Kommandos:\n"
+"    -c|--clean-head    Druckköpfe reinigen.\n"
+"    -n|--nozzle-check  Testausdruck.\n"
+"                       Schmutzige oder verklebte Düsen sind\n"
+"                         als Aussetzer erkennbar. Wenn diese auftreten, \n"
+"                        sollten sie die Köpfe reinigen\n"
+"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
+"                       Benutzung dieser Option kann eine schlechte "
+"Druckqualität\n"
+"                       oder Druckerschäden verursachen.\n"
+"    -o|--align-color    Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n"
+"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
+"                       Option kann eine schlechte Druckqualität oder\n"
+"                       Druckerschäden verursachen.\n"
+"    -s|--status        Zeigt den Drucker Status.\n"
+"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
+"                         Leserechte auf die Drucker-Schnittstelle. \n"
+"    -d|--identify      Fragt die Modelinformationen ab.\n"
+"                       Benötigt Schreib- und Leserechte auf die Drucker-"
+"Schnittstelle \n"
+"                       Drucker-Schnittstelle.\n"
+"    -l|--license       Zeigt die Lizenz- und Garantiebedingungen dieses "
+"Programmes\n"
+"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
+"    -h|--help          Zeigt diese Informationen an.\n"
+"  Optionen:\n"
+"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
+"                       ohne Angabe = Systemdrucker lp\n"
+"    -r|--raw-device    Gibt die Druckerschnittstelle an.\n"
+"                       Vorsicht-geht nicht durch die Schleife\n"
+"    -u|--new           Der Drucker ist neu (Stylus Colour 740 or\n"
+"                       neuer).\n"
+"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
+"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Sie sollten nur einen Drucker oder eine Schnittstelle angeben."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Sie sollten nur ein Druckermodell angeben."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Unbekannte Option %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Kann keine Befehle an den Drucker senden\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Kann nicht von %s: %s lesen.\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+"Zur Druckerabfrage  bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Kann %s nicht lesen/beschreiben: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Unbekannte Option %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Kann nicht auf %s: %s schreiben.\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Kann auf %s: %s nicht schreiben\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Kann den Druckertype nicht feststellen.\n"
+"Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Foto Papier"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "Mattes Papier"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "helles Cyan"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "helles Magenta"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Schwarz"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "Gelb"
+msgid "Matte Black"
+msgstr "Mattes Papier"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Schwarz"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Normalpapier Schnelleinzug"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Größe"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Farbbalance:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Eingabefehler\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Eingabefehler\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Eingabefehler\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Farbtinte"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Prozent verbleibend"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Drucker Name:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Sie sollten nur ein Druckermodell angeben."
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Reinige die Köpfe...\n"
+
+#: src/escputil/escputil.c:1770
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
+
+#: src/escputil/escputil.c:1774
+#, 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 ""
+"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
+"\n"
+"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
+"Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
+"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
+"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
+"oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n"
+"Risiko seines Einsatzes liegt bei Ihnen.\n"
+" \n"
+"Es werden %d Testmuster gedruckt. Alle Muster ähneln sich.\n"
+"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
+"Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n"
+"\n"
+"Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n"
+"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
+"ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
+"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
+"und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker "
+"ein\n"
+"bevor sie die Zahl eingeben.\n"
+"\n"
+"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
+"Unterschiede\n"
+"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
+"alle\n"
+"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
+"Musterausdruck\n"
+"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
+"\n"
+"Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
+"Drucker sichern (s),\n"
+"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
+"Abbruch  \n"
+"bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
+"nicht länger.\n"
+"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
+"\n"
+"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
+"Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
+"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
+"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
+"oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n"
+"Risiko seines Einsatzes liegt bei Ihnen.\n"
+" \n"
+"Dieses Programm druckt Testmuster.\n"
+"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
+"Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n"
+"\n"
+"Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n"
+"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
+"ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
+"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
+"und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker "
+"ein\n"
+"bevor sie die Zahl eingeben.\n"
+"\n"
+"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
+"Unterschiede\n"
+"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
+"alle\n"
+"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
+"Musterausdruck\n"
+"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
+"\n"
+"Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
+"Drucker sichern (s),\n"
+"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
+"Abbruch  \n"
+"bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
+"nicht länger.\n"
+"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Bitte kontrollieren sie den letzten Ausdruck sehr genau, ob ihr\n"
+"Drucker pefekt ausgerichtet ist. Sie können nun:\n"
+"  (s) die Einstellungen im Drucker sichern ,\n"
+"  (q) das Programm ohne Sicherung verlassen, oder\n"
+"  (r) Den Vorgang von Anfang an wiederholen.\n"
+"Sie werden um eine Bestätigung gebeten.\n"
+"Was möchten sie tun  (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
+"sichern möchten\n"
+
+#: src/escputil/escputil.c:1892
+#, 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 ""
+"Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
+"Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
+
+#: src/escputil/escputil.c:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
+"wiederholen möchten:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Wiederhole die Kopf-Ausrichtung.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Dies wird die Einstellungen ihres Druckers dauerhaft verändern.\n"
+"WARNUNG:diser Vorgang wurde von Seiko Epson nicht geprüft\n"
+"und könnte den Drucker beschädigen. Weiter?\n"
+"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
+"Drucker sichern möchten.\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Wie man die Einstellungen sichert..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "gescheitert!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n"
+"die Kopf-Ausrichtung wiederholen. \n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "erledigt!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Unbekannter Befehl.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 ""
+"Diese Routine geht davon aus, daß ihr Drucker ein Epson %s ist.\n"
+"Wenn nicht drücken sie bitte jetzt control-C und \n"
+"wählen ihr Modell.\n"
+"\n"
+"Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Drücken sie Eingabe um fortzufahren > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n"
+"die beßsten Übereinstimmungen der Muster-Paare .\n"
+"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
+"wiederholen\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Durchgang #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Bitte legen sie ein neues Blatt ein.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Die Zahl ist ungültig!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Wie bitte ?????\n"
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n"
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Beginne die Köpfe einzurichten..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "erledigt. \n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Bitte kontrollieren sie die Ausrichtung. Nachdem die Ausrichtungs-\n"
+"muster nochmal gedruckt wurden, sollten die beßsten Übereinstim-\n"
+"mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
+"Vorgang wiederholen.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Eingabefehler\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Drucken..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Mattes Papier"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Postkarte"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "Durchlichtfolie"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
-msgstr "Premium Glossy Foto Papier"
+msgid "Premium Presentation Paper Matte"
+msgstr "Premium Glanz Foto Papier"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Normalpapier"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Mattes Papier"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Vorschub"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr ""
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Glossy Foto Papier"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
+msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Manuell"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "Drucke in Datei?"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuell"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Premium Glanz Foto Papier"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuell"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Schacht"
+msgid "ColorLife Paper"
+msgstr "Normalpapier"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
 
-#: src/main/escp2-papers.c:1988
-#, fuzzy
-msgid "Photo Board"
-msgstr "Foto Papier"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Normalpapier Schnelleinzug"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "autom. Auswahl"
+msgid "UltraChrome Photo Black"
+msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600×600 DPI monochrome"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150×150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600×600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "600 DPI hohe Qualität"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
 #, fuzzy
-msgid "720 DPI High Quality"
-msgstr "1200 DPI hohe Qualität"
+msgid "360 x 120 DPI Economy"
+msgstr "600×600 DPI monochrome"
 
-#: src/main/escp2-resolutions.c:103
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 DPI Highest Quality"
-msgstr "1200 DPI höchste Qualität"
+msgid "360 x 240 DPI Draft"
+msgstr "600×600 DPI"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "720 DPI High Quality"
+msgstr "1200 DPI hohe Qualität"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
 #, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgid "720 DPI Highest Quality"
+msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "Gelb"
+
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "Drucker Name:"
+msgid "Black 1"
+msgstr "Schwarz"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Schwarz"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1200 DPI höchste Qualität"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Schacht"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manuell"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "Drucke in Datei?"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Vorschub"
+
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Drucker Name:"
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Helligkeit:"
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Foto Papier"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "autom. Auswahl"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "einfarbige Rohausgabe"
+
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "High"
-msgstr "Höhe:"
+msgid "Three Color Raw"
+msgstr "Siebenfarbige Rohausgabe"
+
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Photo"
-msgstr "Foto"
+msgid "Five Color Raw"
+msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Sechsfarbige Rohausgabe"
+
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
 #, fuzzy
-msgid "Super Photo"
-msgstr "Sieben Farb Foto"
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
 #, fuzzy
-msgid "Ultra Photo"
-msgstr "Sechs Farben Foto"
+msgid "Three Color Raw Gloss"
+msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "vierfarbige Rohausgabe"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+#, fuzzy
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Aus sechs Farben gemischt "
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+#, fuzzy
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Aus sieben Farben gemischt"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "Zurücksetzen"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
 #, fuzzy
-msgid "Photograph"
-msgstr "Foto"
+msgid "Seven Color Photo"
+msgstr "Sechs Farben Foto"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Strichzeichnung"
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Aus sechs Farben gemischt "
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Siebenfarbige Rohausgabe"
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "zweistufig Grau"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "zweifarbige Rohausgabe"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
 #, fuzzy
-msgid "Page"
-msgstr "Größe"
+msgid "Eight Color Photo"
+msgstr "Sechs Farben Foto"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Sechsfarbige Rohausgabe"
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
 #, fuzzy
-msgid "Image Type"
-msgstr "Bildtype:"
+msgid "Four Color Photo"
+msgstr "Sechs Farben Foto"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Tintenart im Drucker"
+msgid "Interleave"
+msgstr "Drucker Name:"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Größe"
+msgid "Interleave 2"
+msgstr "Drucker Name:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Größe"
+msgid "Eight Pass"
+msgstr "Helligkeit:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Sieben Farb Foto"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Querformat"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Amerikan. Narrenmütze"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Europäische Narrenmütze"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japanese langer Umschlag #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese langer Umschlag #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 #, fuzzy
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Briefumschlag (Monarch)"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Briefumschlag (Monarch)"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkarte"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-#, fuzzy
-msgid "Custom"
-msgstr "Auto"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89 mm Endlospapier"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Endlospapier"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Endlospapier"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210 mm Endlospapier"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "13 Zoll Endlospapier"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "36 Zoll Endlospapier"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "4 Inch Endlospapier"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3824
+msgid "Epson B-300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3825
+msgid "Epson B-308"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3826
+msgid "Epson B-500DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3827
+msgid "Epson B-508DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 msgid "Epson Stylus C79"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 msgid "Epson Stylus C87"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 msgid "Epson Stylus C110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 msgid "Epson Stylus C120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 msgid "Epson Stylus Photo 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 msgid "Epson Stylus Photo 1410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 msgid "Epson Stylus Photo R230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 msgid "Epson Stylus Photo R240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 msgid "Epson Stylus Photo R245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 msgid "Epson Stylus Photo R260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 msgid "Epson Stylus Photo R265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 msgid "Epson Stylus Photo R270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 msgid "Epson Stylus Photo R280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 msgid "Epson Stylus Photo R285"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 msgid "Epson Stylus Photo R350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 msgid "Epson Stylus Photo R360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 msgid "Epson Stylus Photo R380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 msgid "Epson Stylus Photo R390"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 msgid "Epson Stylus Photo RX560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 msgid "Epson Stylus Photo RX580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 msgid "Epson Stylus Photo RX585"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 msgid "Epson Stylus Photo RX590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 msgid "Epson Stylus Photo RX595"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 msgid "Epson Stylus Photo RX640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 msgid "Epson Stylus Photo RX680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 msgid "Epson Stylus Photo RX685"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
-msgid "Epson Stylus Photo RX700"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
+#: src/xml/xmli18n-tmp.h:3988
+msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 msgid "Epson Stylus CX4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 msgid "Epson Stylus CX4900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 msgid "Epson Stylus CX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 msgid "Epson Stylus CX5000F"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4032
 msgid "Epson Stylus CX5600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 msgid "Epson Stylus CX6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 msgid "Epson Stylus CX7000F"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 msgid "Epson Stylus CX7400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4047
 msgid "Epson Stylus CX9400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 msgid "Epson Stylus D92"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 msgid "Epson Stylus D120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 msgid "Epson Stylus DX4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 msgid "Epson Stylus DX4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 msgid "Epson Stylus DX4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 msgid "Epson Stylus DX7000F"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 msgid "Epson Stylus DX7400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 msgid "Epson Stylus DX7450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 msgid "Epson Stylus DX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 msgid "Epson Stylus DX8450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+msgid "Epson WorkForce 40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4106
+msgid "Epson WorkForce 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4107
+msgid "Epson WorkForce 600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+msgid "Epson ME Office 70"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4127
+msgid "Epson ME Office 80W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4128
+msgid "Epson ME Office 700FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+msgid "Epson Offirio PX B300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4183
+msgid "Epson Offirio PX B500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4184
+msgid "Epson PX 101"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4185
+msgid "Epson PX 201"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4186
+msgid "Epson PX 601F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+msgid "Epson PX G5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+msgid "Epson EPL-N2050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4282
+msgid "Epson EPL-N2050+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4283
+msgid "Epson EPL-N2050PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+msgid "Epson EPL-N2120"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4286
+msgid "Epson EPL-N2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4287
+msgid "Epson EPL-N2500PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4288
+msgid "Epson EPL-N2750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4289
+msgid "Epson EPL-N2750PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Drucker Name:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Drucker einrichten"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Schwarz"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Zoll"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Stelle die Basismaßeinheit auf Zoll"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Die Basiseinheit auf Zentimeter einstellen"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Drucken"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Stelle die Basismaßeinheit auf Zoll"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Die Basiseinheit auf Zentimeter einstellen"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Stelle die Basismaßeinheit auf Zoll"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Farbausgabe"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Drucke Graustufen nur mit schwarzer Tinte"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "Standard"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Befehl:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Datei"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Drucke in Datei?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Zurücksetzen"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Abbruch"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Drucker einrichten..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Drucke v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Über"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Drucke und\n"
-"Sichere die Einstellungen"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"Sichere\n"
-"die Einstellungen"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Drucken"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Vorschau"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"Position des Bildes in der Seite.\n"
-"Mit der linken Maustaste verschieben sie das Bild.\n"
-"Mit der rechten geht es feiner; jede Bewegung verschiebt das Bild um einen "
-"Punkt (1/72\")\n"
-"Die mittlere verschiebt das Bild in Relation zur seiner Größe\n"
-"Wenn sie dabei die Umschalttaste (Shift) gedrückt halten, verschieben sie "
-"entweder nur waagerecht oder nur senkrecht\n"
-"Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
-"in seine Ausgangsposition zurück."
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "Größe"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Maße:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Breite:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Breite des Papiers"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Höhe:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Höhe des Papiers"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "Größe"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Position"
+msgid "Oki Super 6e"
+msgstr "Sieben Farb Foto"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Auto"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Aufrecht"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Querformat"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "umgekehrt Aufrecht"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "umgekehrt Querformat"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
-"wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
-"umgekehrt Querformat"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Ausrichtung:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "links:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Entfernung vom linken Blattrand Bildrand"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "rechts:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Entfernung vom linken Blattrand zum rechten Bildrand"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Entfernung vom rechten Blattrand zum Bildrand"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Oben:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Entfernung vom oberen Blattrand zum Bildrand"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "unten:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Entfernung vom oberen Blattrand zum unteren Bildrand"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Entfernung vom unteren Blattrand zum Bild"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Zentrieren:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Waagerecht"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Bild waagerecht auf dem Blatt zentrieren"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Beides"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Bild auf dem Blatt zentrieren"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "senkrecht"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Bild senkrecht auf dem Blatt zentrieren"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Drucker einrichten"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Drucker Name:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "Wählen sie ihr Druckermodel"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Druckermodel:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Wählen sie ihr Druckermodel"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD Datei:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Suchen"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-#, fuzzy
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
-"Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
-"Modell...)"
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Drucker Name:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "Probeausdruck"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Drucke in Datei?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Neuen Printer einrichten"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Drucker Name:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an."
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Über Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Gimp-Print Version "
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Drucker Einstellungen"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
-"Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
-"Modell...)"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Drucker einrichten..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
-"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
-"diesem Drucker"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "neuer Drucker..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
-"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
-"einen Namen geben und später unter diesem einfach aufrufen."
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Zurücksetzen"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Größe"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Zoom:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Einstellung der Bildgröße"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
-"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
-"sollen"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Prozent"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Bildgröße an Seitengröße anpassen"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Einstellen der Breite des Ausdrucks"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Einstellen der Höhe des Ausdrucks"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"Benutze originale\n"
-"Bildgröße"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Ausdruckgröße gleich Bildgröße"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Farbabstimmung"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Zurücksetzen"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Schließen"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Vorschau"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Ausgabeart:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Ausgabeart:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Wählen sie die gewüschte Ausgabeart:"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Ausgabeeinstellungen.."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
-"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Einheiten:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Einheiten:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Wählen sie die Basismaßeinheit für das Drucken"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Drucken"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Drucker einrichten"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Drucker Einstellungen"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Ausgabeart:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Befehl:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "Schacht 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "Schacht 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "Schacht 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "Schacht 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "German"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil Version "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Dieses Programm ist freie Software. Sie können es unter\n"
-"    den Bedingungen der GNU General Public License, wie von der\n"
-"    Free Software Foundation herausgegeben, weitergeben und/oder\n"
-"    modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n"
-"    Sie es wünschen) jeder späteren Version.\n"
-"    Die Veröffentlichung dieses Programms erfolgt in der\n"
-"    Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n"
-"    GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n"
-"    der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK\n"
-".    Details finden Sie in der GNU General Public License.\n"
-"    Sie sollten eine Kopie der GNU General Public License zusammen\n"
-"    mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n"
-"    an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
-"    MA 02139, USA.\n"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
-"Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
-"Perform maintenance on EPSON Stylus ® printers \n"
-" Beispiel: escputil --clean-head --printer stpex-on-third-floor\n"
-"          escputil --ink-level --new --raw-device /dev/lp0\n"
-"\n"
-"   Kommandos:\n"
-"    -c|--clean-head    Druckköpfe reinigen.\n"
-"    -n|--nozzle-check  Testausdruck.\n"
-"                       Schmutzige oder verklebte Düsen sind\n"
-"                         als Aussetzer erkennbar. Wenn diese auftreten, \n"
-"                        sollten sie die Köpfe reinigen\n"
-"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
-"                       Benutzung dieser Option kann eine schlechte "
-"Druckqualität\n"
-"                       oder Druckerschäden verursachen.\n"
-"    -o|--align-color    Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n"
-"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
-"                       Option kann eine schlechte Druckqualität oder\n"
-"                       Druckerschäden verursachen.\n"
-"    -s|--status        Zeigt den Drucker Status.\n"
-"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
-"                         Leserechte auf die Drucker-Schnittstelle. \n"
-"    -d|--identify      Fragt die Modelinformationen ab.\n"
-"                       Benötigt Schreib- und Leserechte auf die Drucker-"
-"Schnittstelle \n"
-"                       Drucker-Schnittstelle.\n"
-"    -l|--license       Zeigt die Lizenz- und Garantiebedingungen dieses "
-"Programmes\n"
-"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
-"    -h|--help          Zeigt diese Informationen an.\n"
-"  Optionen:\n"
-"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
-"                       ohne Angabe = Systemdrucker lp\n"
-"    -r|--raw-device    Gibt die Druckerschnittstelle an.\n"
-"                       Vorsicht-geht nicht durch die Schleife\n"
-"    -u|--new           Der Drucker ist neu (Stylus Colour 740 or\n"
-"                       neuer).\n"
-"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
-"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
-#: src/escputil/escputil.c:162
-#, fuzzy
-msgid ""
-"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
-"Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
-"Perform maintenance on EPSON Stylus ® printers \n"
-" Beispiel: escputil --clean-head --printer stpex-on-third-floor\n"
-"          escputil --ink-level --new --raw-device /dev/lp0\n"
-"\n"
-"   Kommandos:\n"
-"    -c|--clean-head    Druckköpfe reinigen.\n"
-"    -n|--nozzle-check  Testausdruck.\n"
-"                       Schmutzige oder verklebte Düsen sind\n"
-"                         als Aussetzer erkennbar. Wenn diese auftreten, \n"
-"                        sollten sie die Köpfe reinigen\n"
-"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
-"                       Benutzung dieser Option kann eine schlechte "
-"Druckqualität\n"
-"                       oder Druckerschäden verursachen.\n"
-"    -o|--align-color    Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n"
-"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
-"                       Option kann eine schlechte Druckqualität oder\n"
-"                       Druckerschäden verursachen.\n"
-"    -s|--status        Zeigt den Drucker Status.\n"
-"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
-"                         Leserechte auf die Drucker-Schnittstelle. \n"
-"    -d|--identify      Fragt die Modelinformationen ab.\n"
-"                       Benötigt Schreib- und Leserechte auf die Drucker-"
-"Schnittstelle \n"
-"                       Drucker-Schnittstelle.\n"
-"    -l|--license       Zeigt die Lizenz- und Garantiebedingungen dieses "
-"Programmes\n"
-"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
-"    -h|--help          Zeigt diese Informationen an.\n"
-"  Optionen:\n"
-"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
-"                       ohne Angabe = Systemdrucker lp\n"
-"    -r|--raw-device    Gibt die Druckerschnittstelle an.\n"
-"                       Vorsicht-geht nicht durch die Schleife\n"
-"    -u|--new           Der Drucker ist neu (Stylus Colour 740 or\n"
-"                       neuer).\n"
-"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
-"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Sie sollten nur einen Drucker oder eine Schnittstelle angeben."
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Sie sollten nur ein Druckermodell angeben."
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Unbekannte Option %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Kann auf den Drucker nicht drucken. %s with %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Kann keine Befehle an den Drucker senden\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Kann nicht von %s: %s lesen.\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
-"Zur Druckerabfrage  bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Kann %s nicht lesen/beschreiben: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Unbekannte Option %s\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Kann nicht auf %s: %s schreiben.\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"Kann auf %s: %s nicht schreiben\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"Kann den Druckertype nicht feststellen.\n"
-"Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Farbbalance:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "Eingabefehler\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "Eingabefehler\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Drucker einrichten"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Farbtinte"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Prozent verbleibend"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
 msgstr ""
-"Zur Druckererkennung bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Sie sollten nur ein Druckermodell angeben."
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Reinige die Köpfe...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
-"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
-"\n"
-"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
-"Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
-"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
-"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
-"oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n"
-"Risiko seines Einsatzes liegt bei Ihnen.\n"
-" \n"
-"Es werden %d Testmuster gedruckt. Alle Muster ähneln sich.\n"
-"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
-"Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n"
-"\n"
-"Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n"
-"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
-"ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
-"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
-"und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker "
-"ein\n"
-"bevor sie die Zahl eingeben.\n"
-"\n"
-"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
-"Unterschiede\n"
-"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
-"alle\n"
-"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
-"Musterausdruck\n"
-"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
-"\n"
-"Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
-"Drucker sichern (s),\n"
-"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
-"Abbruch  \n"
-"bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
-"nicht länger.\n"
-"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
-"\n"
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
-"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
-"\n"
-"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
-"Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
-"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
-"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
-"oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n"
-"Risiko seines Einsatzes liegt bei Ihnen.\n"
-" \n"
-"Dieses Programm druckt Testmuster.\n"
-"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
-"Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n"
-"\n"
-"Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n"
-"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
-"ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
-"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
-"und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker "
-"ein\n"
-"bevor sie die Zahl eingeben.\n"
-"\n"
-"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
-"Unterschiede\n"
-"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
-"alle\n"
-"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
-"Musterausdruck\n"
-"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
-"\n"
-"Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
-"Drucker sichern (s),\n"
-"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
-"Abbruch  \n"
-"bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
-"nicht länger.\n"
-"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
-"\n"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Kann keinen Befehl an den Drucken senden, beende mich.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
-"Bitte kontrollieren sie den letzten Ausdruck sehr genau, ob ihr\n"
-"Drucker pefekt ausgerichtet ist. Sie können nun:\n"
-"  (s) die Einstellungen im Drucker sichern ,\n"
-"  (q) das Programm ohne Sicherung verlassen, oder\n"
-"  (r) Den Vorgang von Anfang an wiederholen.\n"
-"Sie werden um eine Bestätigung gebeten.\n"
-"Was möchten sie tun  (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 msgstr ""
-"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
-"sichern möchten\n"
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 msgstr ""
-"Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
-"Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
-"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
-"wiederholen möchten:\n"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Wiederhole die Kopf-Ausrichtung.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
-"Dies wird die Einstellungen ihres Druckers dauerhaft verändern.\n"
-"WARNUNG:diser Vorgang wurde von Seiko Epson nicht geprüft\n"
-"und könnte den Drucker beschädigen. Weiter?\n"
-"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
-"Drucker sichern möchten.\n"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Wie man die Einstellungen sichert..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "gescheitert!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
-"Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n"
-"die Kopf-Ausrichtung wiederholen. \n"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "erledigt!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Die Kopfausrichtung wurde im Drucker gespeichert.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Unbekannter Befehl.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
-"Diese Routine geht davon aus, daß ihr Drucker ein Epson %s ist.\n"
-"Wenn nicht drücken sie bitte jetzt control-C und \n"
-"wählen ihr Modell.\n"
-"\n"
-"Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Drücken sie Eingabe um fortzufahren > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 msgstr ""
-"Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n"
-"die beßsten Übereinstimmungen der Muster-Paare .\n"
-"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
-"wiederholen\n"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Durchgang #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Bitte legen sie ein neues Blatt ein.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Die Zahl ist ungültig!\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Wie bitte ?????\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Beginne die Köpfe einzurichten..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "erledigt. \n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
-"Bitte kontrollieren sie die Ausrichtung. Nachdem die Ausrichtungs-\n"
-"muster nochmal gedruckt wurden, sollten die beßsten Übereinstim-\n"
-"mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
-"Vorgang wiederholen.\n"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Eingabefehler\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Drucken..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "zweistufig Grau"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Aus sieben Farben gemischt"
+
+#, 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"
@@ -8560,18 +12554,12 @@ msgstr "Drucken..."
 #~ msgid "High Gloss Film"
 #~ msgstr "High Gloss Film"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Glossy Foto Papier"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Glossy Foto Karten"
 
 #~ msgid "Photo Paper Pro"
 #~ msgstr "Foto Papier Pro"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY Farbe"
-
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK Farbe"
 
@@ -8904,9 +12892,6 @@ msgstr "Drucken..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Art des Druckmediums"
 
-#~ msgid "Media Size:"
-#~ msgstr "Papier Größe:"
-
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "Größe des Papiers "
 
diff --git a/po/el.gmo b/po/el.gmo
index fe74123..e40fb5c 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 42d7433..0bf97b6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,12 +1,12 @@
 # Greek translation for gimp-print.
 # Copyright (C) 2001 Free Software Foundation.
 # Simos Xenitellis <simos@hellug.gr>, 2001.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2001-12-29 20:10+0000\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
@@ -99,18 +99,19 @@ msgstr ""
 msgid "Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -158,9 +159,9 @@ msgid "Dither algorithm"
 msgstr ""
 
 #
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "ÌÝãåèïò"
@@ -169,325 +170,371 @@ msgstr "ÌÝãåèïò"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 #, fuzzy
 msgid "Media Type"
 msgstr "Åßäïò MIME"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 #, fuzzy
 msgid "Media Source"
 msgstr "Áíïéêôü Ëïãéóìéêü"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "ÁíÜëõóç"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 #, fuzzy
 msgid "Ink Type"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 #, fuzzy
 msgid "Type of ink in the printer"
 msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¼íïìá åêôõðùôÞ:"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr ""
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "ìþâ"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
 #
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "×ñþìá"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Ìáõ_ñüáóðñï"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Byte Åîüäïõ"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Êáíïíéêü"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -523,9 +570,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Åêôýðùóç"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
@@ -542,11 +588,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -614,7 +660,7 @@ msgid "Output image type"
 msgstr "Byte Åîüäïõ"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -680,16 +726,56 @@ msgstr "ÃÜììá"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Êõáíü"
 
@@ -698,16 +784,56 @@ msgstr "Êõáíü"
 msgid "Adjust the cyan gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 #, fuzzy
 msgid "Magenta"
 msgstr "ìþâ"
@@ -717,16 +843,56 @@ msgstr "ìþâ"
 msgid "Adjust the magenta gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Êßôñéíï"
 
@@ -735,9 +901,11 @@ msgstr "Êßôñéíï"
 msgid "Adjust the yellow gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -746,7 +914,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -755,9 +923,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -767,16 +936,54 @@ msgid "Adjust the blue gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Ìáýñï"
 
@@ -785,7 +992,7 @@ msgstr "Ìáýñï"
 msgid "Adjust the black gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -800,7 +1007,7 @@ msgstr "Êëßìáêá ôïõ ãêñé"
 msgid "Adjust the cyan gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "ìþâ"
@@ -810,7 +1017,7 @@ msgstr "ìþâ"
 msgid "Adjust the magenta gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
@@ -840,10 +1047,11 @@ msgstr "Ôýðïò MIME"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Byte Åîüäïõ"
@@ -852,27 +1060,27 @@ msgstr "Byte Åîüäïõ"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1020,502 +1228,569 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr ""
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Üãíùóôï ÷ñþìá: %s"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
 #
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Áêýñùóç"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Êõáíü"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "ìþâ"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Êõáíü"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Ðõêíüôçôá"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Byte Åîüäïõ"
+msgid "Paper Thickness"
+msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Ðõêíüôçôá"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Êýñéá Óåëßäá"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Êáíïíéêü"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
 #
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1569,135 +1844,362 @@ msgid "test print"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 #, fuzzy
 msgid "Plain Paper"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 #, fuzzy
 msgid "Transparencies"
 msgstr "ÄéáöáíÝò"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 #, fuzzy
 msgid "Envelopes"
 msgstr "ÐñïãñáììáôéóôÝò"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 #, fuzzy
 msgid "Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 #, fuzzy
 msgid "Photo Paper"
 msgstr "Êåßìåíá"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr ""
 
 #
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "¶ëëá"
 
@@ -1715,192 +2217,217 @@ msgstr "Óåëßäá åã÷åéñéäßïõ"
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 #, fuzzy
 msgid "Plain"
 msgstr "Óå áíáðáñáãùãÞ"
 
 #
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 #, fuzzy
 msgid "Bond"
 msgstr "¸íôïíç ÃñáöÞ"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 #, fuzzy
 msgid "Premium"
 msgstr "Ðñùô"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 #, fuzzy
 msgid "Transparency"
 msgstr "ÄéáöáíÝò"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 #, fuzzy
 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/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Åã÷åéñßäéï"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 #, fuzzy
 msgid "Tray 1"
 msgstr "ÄïêéìÞ"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 #, fuzzy
 msgid "Tray 2"
 msgstr "ÄïêéìÞ"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 #, fuzzy
 msgid "Tray 3"
 msgstr "ÄïêéìÞ"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 #, fuzzy
 msgid "Tray 4"
 msgstr "ÄïêéìÞ"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 #, fuzzy
 msgid "Desktop Sheet Feeder"
 msgstr "Ñõèìßóåéò åðéöÜíåéáò åñãáóßáò"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 #, fuzzy
 msgid "Tray"
 msgstr "ÄïêéìÞ"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 #, fuzzy
 msgid "Optional Source"
 msgstr "Áíïéêôü Ëïãéóìéêü"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 #, fuzzy
 msgid "Autoselect"
 msgstr "ÁðåðéëïãÞ"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 #, fuzzy
 msgid "600x600 DPI monochrome"
 msgstr "ìïíü÷ñùìï"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "¾øïò:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Êñõðôïãñáößá"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr ""
 
@@ -1909,6558 +2436,10044 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr " Áñ÷åßï "
 
 #
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Áêýñùóç"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "ÄéáóôÜóåéò Letter"
+
+#
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "ÄéáóôÜóåéò Á4"
+
+# Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
 #, fuzzy
-msgid "Two Level Grayscale"
-msgstr "Êëßìáêá ôïõ ãêñé"
+msgid "Super Photo"
+msgstr "Slashdot"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Êëßìáêá ôïõ ãêñé"
+msgid "Ultra Photo"
+msgstr "Slashdot"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
+
+#: src/main/generic-options.c:46
+msgid "Text"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
+#: 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
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Photograph"
+msgstr "Êñõðôïãñáößá"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
+#: src/main/generic-options.c:50
+#, fuzzy
+msgid "Line Art"
+msgstr "ÃñáììÞ"
+
+#
+#: src/main/generic-options.c:55
+#, fuzzy
+msgid "Page"
+msgstr "ÌÝãåèïò"
+
+#: src/main/generic-options.c:56
+msgid "Job"
 msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "Seven Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Image Type"
+msgstr "Ôýðïò Óôïé÷åßïõ:"
 
-#: src/main/escp2-channels.c:1705
+#: src/main/generic-options.c:69
 #, fuzzy
-msgid "Seven Color Enhanced"
-msgstr "Stylus Color Pro"
+msgid "Type of image being printed"
+msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Page Number"
+msgstr "ÌÝãåèïò"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Page number"
+msgstr "ÌÝãåèïò"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
+#: src/gutenprintui2/curve.c:130
+#, fuzzy
+msgid "Curve type"
+msgstr "Ìáýñï"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
 msgstr ""
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/gutenprintui2/panel.c:276
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "Stylus Color Pro"
+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 "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr ""
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Points"
+msgstr "Åêôýðùóç"
 
-#: src/main/escp2-channels.c:1981
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Stylus Color Pro"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
 msgstr ""
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:291
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Color output"
+msgstr "Êýëéóç üôáí õðÜñ÷åé íÝá Ýîïäïò"
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Standard Command"
+msgstr "Êáíïíéêü"
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
+
+#
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Stylus Color Pro"
+msgid "Custom Command"
+msgstr "ÅíôïëÞ:"
 
-#: src/main/escp2-channels.c:2335
+#: 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
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Print to a file"
+msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Slashdot"
+msgid "Set Default"
+msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr "ÅíôÜîåé"
+
+#
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Áêýñùóç"
+
+#: src/gutenprintui2/panel.c:642
+#, fuzzy
+msgid "Select File..."
+msgstr "Ñýèìéóç ÅêôõðùôÞ"
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1383
+#, fuzzy, c-format
+msgid "%s -- Print v%s"
+msgstr "%s Ýêäïóç %s"
+
+#
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Ðåñß"
+
+#: src/gutenprintui2/panel.c:1394
+#, fuzzy
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
+
+#: src/gutenprintui2/panel.c:1396
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Height of the paper that you wish to print to"
+msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
+
+#
+#: src/gutenprintui2/panel.c:1577
+#, fuzzy
+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
+#, fuzzy
+msgid "Image Position"
+msgstr "ÈÝóç"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Áõôüìáôï"
+
+# Not sure how the terms "portrait" and "landscape" are usually
+# translated; if anyone knows what the term in the Greek version
+# of MSWindoze is and if it is better (or equally good), maybe we
+# would want to use that for consistency and for the sake of newbies?
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Ðïñôñáßôï"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Ïñéæüíôéïò"
+
+#: src/gutenprintui2/panel.c:1661
+#, fuzzy
+msgid "Upside down"
+msgstr "ÁíÜðïäá"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Tïðßï"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1669
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Center:"
+msgstr "ÊÝíôñï"
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "_Ïñéæüíôéá"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr ""
+
+#
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Êáé ôá äýï"
+
+#: src/gutenprintui2/panel.c:1717
+#, fuzzy
+msgid "Center the image on the paper"
+msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "Êáôáêüñõ_öá"
+
+#: src/gutenprintui2/panel.c:1720
+#, fuzzy
+msgid "Center the image vertically on the paper"
+msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Ñýèìéóç ÅêôõðùôÞ"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+#, fuzzy
+msgid "Printer Model:"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#
+#: src/gutenprintui2/panel.c:1797
+#, fuzzy
+msgid "Select your printer model"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#: src/gutenprintui2/panel.c:1845
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "File to print to"
+msgstr "Ôßôëïé ðñïò åêôýðùóç"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "Åêôýðùóç óå Áñ÷åßï"
+
+#
+#: src/gutenprintui2/panel.c:1987
+#, fuzzy
+msgid "Define New Printer"
+msgstr "ÅðéëïãÞ åêôõðùôÞ"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+#, fuzzy
+msgid "Printer Name:"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#: src/gutenprintui2/panel.c:2009
+#, fuzzy
+msgid "Enter the name you wish to give this logical printer"
+msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå."
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "Óçìåßï ÐñïóÜñôçóçò: "
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Åêôýðùóç óå: "
+
+#: src/gutenprintui2/panel.c:2074
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Image Size"
+msgstr "ÌÝãåèïò"
+
+#: src/gutenprintui2/panel.c:2199
+#, fuzzy
+msgid "Scaling:"
+msgstr "ÁðïèÞêåõóç:"
+
+#: src/gutenprintui2/panel.c:2203
+#, fuzzy
+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
+#, fuzzy
+msgid "Scale the print to the size of the page"
+msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+
+#
+#: src/gutenprintui2/panel.c:2242
+#, fuzzy
+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
+#, fuzzy
+msgid "Set the width of the print"
+msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý"
+
+#: src/gutenprintui2/panel.c:2267
+#, fuzzy
+msgid "Set the height of the print"
+msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+
+#: src/gutenprintui2/panel.c:2273
+#, fuzzy
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr "Áñ÷éêü _ÌÝãåèïò"
+
+#: src/gutenprintui2/panel.c:2279
+#, fuzzy
+msgid "Set the print size to the size of the image"
+msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá"
+
+#: src/gutenprintui2/panel.c:2303
+#, fuzzy
+msgid "Print Color Adjust"
+msgstr "Ðñùôåýùíôá ×ñþìáôá"
+
+#: src/gutenprintui2/panel.c:2306
+#, fuzzy
+msgid "Set Defaults"
+msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+
+#
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Êëåßóéìï"
+
+#: src/gutenprintui2/panel.c:2337
+#, fuzzy
+msgid "Image preview"
+msgstr "ÐáñáôçñçôÞò Åéêüíùí"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Byte Åîüäïõ"
+
+#: src/gutenprintui2/panel.c:2470
+#, fuzzy
+msgid "Output Type:"
+msgstr "Byte Åîüäïõ"
+
+#: src/gutenprintui2/panel.c:2474
+#, fuzzy
+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
+#, fuzzy
+msgid "Size Units:"
+msgstr "&ÌïíÜäåò:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+msgid " "
+msgstr "> "
+
+#: src/gutenprintui2/panel.c:2550
+#, fuzzy
+msgid "Units:"
+msgstr "&ÌïíÜäåò:"
+
+#: src/gutenprintui2/panel.c:2555
+#, fuzzy
+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
+#, fuzzy
+msgid "Printer"
+msgstr "Åêôýðùóç"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Ñýèìéóç ÅêôõðùôÞ"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Ñõèìßóåéò ÅðéëïãÝá"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Byte Åîüäïõ"
+
+#
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "ÅíôïëÞ:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "ÄïêéìÞ"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "ÄïêéìÞ"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "ÄïêéìÞ"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "ÄïêéìÞ"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Greek"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "ÌÝãåèïò ×:"
+
+#
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "×ñþìá"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "×ñþìá"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+#, fuzzy
+msgid "CMY Color"
+msgstr "+ ×ñþìá"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+#, fuzzy
+msgid "Escputil version "
+msgstr "%s Ýêäïóç %s"
+
+#: 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:333 src/escputil/escputil.c:341
+#, fuzzy, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+
+#: src/escputil/escputil.c:349
+#, fuzzy, c-format
+msgid "You may only specify one printer model."
+msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, fuzzy, c-format
+msgid "Unknown option %c\n"
+msgstr "¶ãíùóôïò êùäéêüò op %u"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, fuzzy, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+
+#: src/escputil/escputil.c:486
+#, fuzzy, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, fuzzy, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Áíåðéôõ÷Þò óýíäåóç óôï ðéëüôï"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, fuzzy, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:736
+#, fuzzy, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "¶ãíùóôïò êùäéêüò op %u"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, fuzzy, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "ÅããñáöÞ áäýíáôç: %s"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr "ÅããñáöÞ áäýíáôç: %s"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Êåßìåíá"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "×áñôß Ìáíßëá"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Ìáýñï"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "Êßôñéíï"
+msgid "Matte Black"
+msgstr "×áñôß Ìáíßëá"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Ìáýñï"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
+#
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
 #, fuzzy
-msgid "Plain Paper Fast Load"
-msgstr "Êýñéá Óåëßäá"
+msgid "Orange"
+msgstr "ÌÝãåèïò"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
-#, fuzzy
-msgid "Postcard"
-msgstr "Ôåëåõôáßá êáñôÝëá"
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
-#, fuzzy
-msgid "Back Light Film"
-msgstr "Åëáöñý ÷áëÜæé"
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
-#, fuzzy
-msgid "Matte Paper Heavyweight"
-msgstr "×áñôß Ìáíßëá"
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
+#
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Êïñåóìüò:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Êýñéá Óåëßäá"
+msgid "Ink color"
+msgstr " ÷ñþìá"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "×áñôß Ìáíßëá"
+msgid "Percent remaining"
+msgstr "Åðß ôïéò åêáôü åëåýèåñï"
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1499
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+
+#: src/escputil/escputil.c:1753
+#, fuzzy, c-format
+msgid "Cleaning heads...\n"
+msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
+
+#: src/escputil/escputil.c:1770
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1774
+#, 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:1809
+#, 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:1853
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1892
+#, 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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1907
+#, fuzzy, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+
+#: src/escputil/escputil.c:1913
+#, 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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr ""
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1937
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1942
+#, fuzzy, c-format
+msgid "Unrecognized command.\n"
+msgstr "Üãíùóôï ÷ñþìá: %s"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
+#: src/escputil/escputil.c:1950
+#, 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:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
 #, fuzzy
-msgid "Roll Feed"
-msgstr "Ñüëïò"
+msgid "Press enter to continue > "
+msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
+#: src/escputil/escputil.c:2026
+#, 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/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
 msgstr ""
 
-# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, fuzzy, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
+
+#: src/escputil/escputil.c:2066
+#, fuzzy, c-format
+msgid "Number out of range!\n"
+msgstr "Áñéèìüò Óåëßäùí"
+
+#: src/escputil/escputil.c:2071
+#, fuzzy, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2084
+#, fuzzy, c-format
+msgid "Attempting to set alignment..."
+msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2088
+#, 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:2134
+#, fuzzy, c-format
+msgid "Error in input\n"
+msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+
+#: src/gimp2/print-image-gimp.c:225
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Åã÷åéñßäéï"
+msgid "Printing..."
+msgstr "Åêôõðþíåôáé .."
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
 #, fuzzy
-msgid "Print to CD"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
+msgid "Bright White Paper"
+msgstr "×áñôß Ìáíßëá"
 
-# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Åã÷åéñßäéï"
+msgid "Postcard"
+msgstr "Ôåëåõôáßá êáñôÝëá"
 
-# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Åã÷åéñßäéï"
+msgid "Back Light Film"
+msgstr "Åëáöñý ÷áëÜæé"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
-msgid "Rear Tray"
-msgstr "ÄïêéìÞ"
+msgid "Matte Paper Heavyweight"
+msgstr "×áñôß Ìáíßëá"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:27
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:29
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
 #, fuzzy
-msgid "Photo Board"
+msgid "Ultra Glossy Photo Paper"
 msgstr "Êåßìåíá"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:35
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:37
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:41
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+msgid "Ultra Premium Photo Paper Luster"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "ÁðåðéëïãÞ"
+msgid "ColorLife Paper"
+msgstr "Êýñéá Óåëßäá"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
-msgid "360 x 90 DPI Fast Economy"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+#, fuzzy
+msgid "Plain Paper Fast Load"
+msgstr "Êýñéá Óåëßäá"
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "×áñôß Ìáíßëá"
+
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "ìïíü÷ñùìï"
+msgid "UltraChrome Photo Black"
+msgstr "Slashdot"
 
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
+msgid "360 x 90 DPI Fast Economy"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+#, fuzzy
+msgid "360 x 120 DPI Economy"
+msgstr "ìïíü÷ñùìï"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 DPI"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-#, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "Êßôñéíï"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgid "Black 1"
+msgstr "Ìáýñï"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Ìáýñï"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Åã÷åéñßäéï"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "Åêôýðùóç óå Áñ÷åßï"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
 #, fuzzy
-msgid "Interleave 2"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgid "Roll Feed"
+msgstr "Ñüëïò"
 
-#: src/main/escp2-resolutions.c:594
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Åñãáóßá"
+msgid "Manual Sheet Guide"
+msgstr "Åã÷åéñßäéï"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Åã÷åéñßäéï"
+
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Êåßìåíá"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "ÁðåðéëïãÞ"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "¾øïò:"
+msgid "One Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "Êñõðôïãñáößá"
+msgid "Three Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Slashdot"
+msgid "Four Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
-msgstr "Slashdot"
+msgid "Five Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:46
-msgid "Text"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
 #, fuzzy
-msgid "Photograph"
-msgstr "Êñõðôïãñáößá"
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:50
+#: src/xml/xmli18n-tmp.h:3210
 #, fuzzy
-msgid "Line Art"
-msgstr "ÃñáììÞ"
+msgid "Default Black"
+msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
 #, fuzzy
-msgid "Page"
-msgstr "ÌÝãåèïò"
+msgid "Seven Color Photo"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:56
-msgid "Job"
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Image Type"
-msgstr "Ôýðïò Óôïé÷åßïõ:"
+msgid "Seven Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
+msgid "Two Level Grayscale"
+msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+#, fuzzy
+msgid "Two Color Raw"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "¼íïìá åêôõðùôÞ:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "ÌÝãåèïò"
+msgid "Interleave 2"
+msgstr "¼íïìá åêôõðùôÞ:"
 
-#
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "ÌÝãåèïò"
+msgid "Eight Pass"
+msgstr "Åñãáóßá"
 
-#
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "ÄéáóôÜóåéò Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
 #
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "ÄéáóôÜóåéò Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 #, fuzzy
 msgid "Tabloid"
 msgstr "Ðßíáêáò"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 #, fuzzy
 msgid "Executive"
 msgstr "ÅêôÝëåóç"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Êåßìåíá"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Slashdot"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "ÄéáóôÜóåéò Á4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
 #
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 #, fuzzy
 msgid "RA0"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 #, fuzzy
 msgid "RA1"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 #, fuzzy
 msgid "RA2"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 #, fuzzy
 msgid "RA3"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 #, fuzzy
 msgid "RA4"
 msgstr "ÄéáóôÜóåéò Á4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
 #
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 #, fuzzy
 msgid "SRA4"
 msgstr "ÄéáóôÜóåéò Á4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 #, fuzzy
 msgid "DL"
 msgstr "Ôåêìçñßùóç"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "ArchA"
 msgstr "Ôüîï"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "ArchB"
 msgstr "Ôüîï"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "ArchC"
 msgstr "Ôüîï"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "ArchD"
 msgstr "Ôüîï"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "ArchE"
 msgstr "Ôüîï"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 #, fuzzy
 msgid "American foolscap"
 msgstr "ÁìåñéêáíéêÞ Óáìüá"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 #, fuzzy
 msgid "European foolscap"
 msgstr "ÁìåñéêáíéêÞ Óáìüá"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "ÄéáóôÜóåéò Á4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "ðñïóïìïßùóç"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Small paperback"
 msgstr "ÅðÝíäõóç"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 #, fuzzy
 msgid "Penguin small paperback"
 msgstr "ÅðÝíäõóç"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 #, fuzzy
 msgid "Hagaki Card"
 msgstr "ÁíáæÞôçóç êáñôÝëáò"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 #, fuzzy
 msgid "A2 Invitation"
 msgstr "Êéíïýìåíá ó÷Ýäéá"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-# Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Slashdot"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
 #
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Ìáýñï"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-#, fuzzy
-msgid "Inch"
-msgstr "ßíôóá"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Åêôýðùóç"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-#, fuzzy
-msgid "Color output"
-msgstr "Êýëéóç üôáí õðÜñ÷åé íÝá Ýîïäïò"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "Êáíïíéêü"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "ÅíôïëÞ:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Áñ÷åßï"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "ÅíôÜîåé"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Áêýñùóç"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, fuzzy, c-format
-msgid "%s -- Print v%s"
-msgstr "%s Ýêäïóç %s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Ðåñß"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-#, fuzzy
-msgid ""
-"Print and\n"
-"Save Settings"
-msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1369
-#, fuzzy
-msgid ""
-"Save\n"
-"Settings"
-msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Åêôýðùóç"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Ðñïåðéóêüðçóç"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "ÌÝãåèïò"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "ÄéáóôÜóåéò:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "ÐëÜôïò:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-#, fuzzy
-msgid "Width of the paper that you wish to print to"
-msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "¾øïò:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-#, fuzzy
-msgid "Height of the paper that you wish to print to"
-msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "ÌÝãåèïò"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
-#, fuzzy
-msgid "Image Position"
-msgstr "ÈÝóç"
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Áõôüìáôï"
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
 
-# Not sure how the terms "portrait" and "landscape" are usually
-# translated; if anyone knows what the term in the Greek version
-# of MSWindoze is and if it is better (or equally good), maybe we
-# would want to use that for consistency and for the sake of newbies?
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Ðïñôñáßôï"
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Ïñéæüíôéïò"
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-#, fuzzy
-msgid "Upside down"
-msgstr "ÁíÜðïäá"
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Tïðßï"
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1642
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Orientation:"
-msgstr "Ðñïóáíáôïëéóìüò"
+msgid "Oki Super 6e"
+msgstr "Slashdot"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "ÁñéóôåñÜ:"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "ÄåîéÜ:"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-#, fuzzy
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "ÐÜíù:"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "ÊÜôù:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-#, fuzzy
-msgid "Center:"
-msgstr "ÊÝíôñï"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "_Ïñéæüíôéá"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Êáé ôá äýï"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-#, fuzzy
-msgid "Center the image on the paper"
-msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Êáôáêüñõ_öá"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-#, fuzzy
-msgid "Center the image vertically on the paper"
-msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "¼íïìá åêôõðùôÞ:"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-#, fuzzy
-msgid "Printer Model:"
-msgstr "¼íïìá åêôõðùôÞ:"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1770
-#, fuzzy
-msgid "Select your printer model"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-#, fuzzy
-msgid "PPD File:"
-msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Åîåñåýíçóç"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "¼íïìá åêôõðùôÞ:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "Ôßôëïé ðñïò åêôýðùóç"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:1960
-#, fuzzy
-msgid "Define New Printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-#, fuzzy
-msgid "Printer Name:"
-msgstr "¼íïìá åêôõðùôÞ:"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-#, fuzzy
-msgid "Enter the name you wish to give this logical printer"
-msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå."
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Óçìåßï ÐñïóÜñôçóçò: "
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Åêôýðùóç óå: "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-#, fuzzy
-msgid "Printer Settings"
-msgstr "Ñõèìßóåéò ÅðéëïãÝá"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2077
-#, fuzzy
-msgid "Setup Printer..."
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:2092
-#, fuzzy
-msgid "New Printer..."
-msgstr "Åêôýðùóç..."
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "ÌÝãåèïò"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-#, fuzzy
-msgid "Scaling:"
-msgstr "ÁðïèÞêåõóç:"
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-#, fuzzy
-msgid "Set the scale (size) of the image"
-msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Ðïóïóôü"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-#, fuzzy
-msgid "Scale the print to the size of the page"
-msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:2215
-#, fuzzy
-msgid "PPI"
-msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-#, fuzzy
-msgid "Set the width of the print"
-msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-#, fuzzy
-msgid "Set the height of the print"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-#, fuzzy
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr "Áñ÷éêü _ÌÝãåèïò"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2252
-#, fuzzy
-msgid "Set the print size to the size of the image"
-msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-#, fuzzy
-msgid "Print Color Adjust"
-msgstr "Ðñùôåýùíôá ×ñþìáôá"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-#, fuzzy
-msgid "Set Defaults"
-msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Êëåßóéìï"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-#, fuzzy
-msgid "Image preview"
-msgstr "ÐáñáôçñçôÞò Åéêüíùí"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Byte Åîüäïõ"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-#, fuzzy
-msgid "Output Type:"
-msgstr "Byte Åîüäïõ"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-#, fuzzy
-msgid "Select the desired output type"
-msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "&ÌïíÜäåò:"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-#, fuzzy
-msgid "Units:"
-msgstr "&ÌïíÜäåò:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-#, fuzzy
-msgid "Select the base unit of measurement for printing"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
 msgstr ""
 
-#
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Åêôýðùóç"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Ñõèìßóåéò ÅðéëïãÝá"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Byte Åîüäïõ"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr ""
 
-#
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "ÅíôïëÞ:"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "ÄïêéìÞ"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "ÄïêéìÞ"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "ÄïêéìÞ"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "ÄïêéìÞ"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
 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:1064
-msgid "English"
-msgstr "Greek"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-#, fuzzy
-msgid "ISOLatin1"
-msgstr "ËÜôéí"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-#, fuzzy
-msgid "Escputil version "
-msgstr "%s Ýêäïóç %s"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
+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"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 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"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 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"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, fuzzy, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, fuzzy, c-format
-msgid "You may only specify one printer model."
-msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, fuzzy, c-format
-msgid "Unknown option %c\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, fuzzy, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, fuzzy, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, fuzzy, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Áíåðéôõ÷Þò óýíäåóç óôï ðéëüôï"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, fuzzy, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:736
-#, fuzzy, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, fuzzy, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "ÅããñáöÞ áäýíáôç: %s"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
-msgstr "ÅããñáöÞ áäýíáôç: %s"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
 msgstr ""
 
-#
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Êïñåóìüò:"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#, fuzzy
-msgid "Ink color"
-msgstr " ÷ñþìá"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5100
 #, fuzzy
-msgid "Percent remaining"
-msgstr "Åðß ôïéò åêáôü åëåýèåñï"
+msgid "Star LaserPrinter 8"
+msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, fuzzy, c-format
-msgid "Cleaning heads...\n"
-msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
 msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
 msgstr ""
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
 msgstr ""
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
 msgstr ""
 
-#: src/escputil/escputil.c:1865
-#, fuzzy, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
 msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
 msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
 msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, fuzzy, c-format
-msgid "Unrecognized command.\n"
-msgstr "Üãíùóôï ÷ñþìá: %s"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
 msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, 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"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-#, fuzzy
-msgid "Press enter to continue > "
-msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, fuzzy, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, fuzzy, c-format
-msgid "Number out of range!\n"
-msgstr "Áñéèìüò Óåëßäùí"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, fuzzy, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, fuzzy, c-format
-msgid "Attempting to set alignment..."
-msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/escputil/escputil.c:2092
-#, fuzzy, c-format
-msgid "Error in input\n"
-msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
 #, fuzzy
-msgid "Printing..."
-msgstr "Åêôõðþíåôáé .."
+#~ msgid "ISOLatin1"
+#~ msgstr "ËÜôéí"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Êëßìáêá ôïõ ãêñé"
+
+#, fuzzy
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Stylus Color Pro"
+
+#, 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 "ÄéáóôÜóåéò Á4"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: No row buffer\n"
@@ -8637,10 +12650,6 @@ msgstr "Åêôõðþíåôáé .."
 #~ msgstr "ÌåôáöïñÜ Áñ÷åßùí"
 
 #, fuzzy
-#~ msgid "CMY Color"
-#~ msgstr "+ ×ñþìá"
-
-#, fuzzy
 #~ msgid "CMYK Color"
 #~ msgstr "+ ×ñþìá"
 
@@ -9095,10 +13104,6 @@ msgstr "Åêôõðþíåôáé .."
 #~ msgstr "Ôýðïò MIME:"
 
 #, fuzzy
-#~ msgid "Media Size:"
-#~ msgstr "ÌÝãåèïò ×:"
-
-#, fuzzy
 #~ msgid "Media Source:"
 #~ msgstr "Áíïéêôü Ëïãéóìéêü"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index b2f8d63..aef36f3 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 7c5ea2d..12f0d20 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,13 +1,13 @@
 # British English messages for gimp-print.
-# Copyright © 2001-2006 Roger Leigh.
+# Copyright © 2001-2008 Roger Leigh.
 # Roger Leigh <rleigh@debian.org>, 2001-2006.
 # Christian Rose <menthos@menthos.com>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
-"PO-Revision-Date: 2006-05-29 12:39+0100\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-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"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Default"
 
@@ -57,9 +57,8 @@ msgid "Ordered"
 msgstr "Ordered"
 
 #: src/main/dither-main.c:65
-#, fuzzy
 msgid "Ordered New"
-msgstr "Ordered"
+msgstr "Ordered New"
 
 #: src/main/dither-main.c:66
 msgid "Fast"
@@ -79,28 +78,29 @@ msgstr "Predithered Input"
 
 #: src/main/dither-main.c:70
 msgid "Drop Size Segmented"
-msgstr ""
+msgstr "Drop Size Segmented"
 
 #: src/main/dither-main.c:71
 msgid "Drop Size Segmented New"
-msgstr ""
+msgstr "Drop Size Segmented New"
 
 #: src/main/dither-main.c:91 src/main/print-color.c:56
 msgid "Density"
 msgstr "Density"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr "Output Level Adjustment"
 
@@ -158,9 +158,9 @@ msgstr "Colour conversion module"
 msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Page Size"
 
@@ -168,303 +168,345 @@ msgstr "Page Size"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "Basic Printer Setup"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Size of the paper being printed to"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Media Type"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type of media (plain paper, photo paper, etc.)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Media Source"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Source (input slot) of the media"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr "CD Hub Size"
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Print only outside of the hub of the CD, or all the way to the hole"
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
-msgstr ""
+msgstr "CD Size (Custom)"
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
-msgstr ""
+msgstr "Variable adjustment for the outer diameter of CD"
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
-#, fuzzy
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
-msgstr "CD Hub Size"
+msgstr "CD Hub Size (Custom)"
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
-#, fuzzy
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 msgid "Variable adjustment to the inner hub of the CD"
-msgstr "Scale the print to the size of the page"
+msgstr "Variable adjustment to the inner hub of the CD"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr "CD Horizontal Fine Adjustment"
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Advanced Printer Setup"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Fine adjustment to horizontal position for CD printing"
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr "CD Vertical Fine Adjustment"
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Resolution"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Resolution and quality of the print"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Ink Type"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type of ink in the printer"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr "Ink Channels"
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Advanced Printer Functionality"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printing Mode"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Core Parameter"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "Double-Sided Printing"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble Setting"
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Print Quality"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr "Basic Output Adjustment"
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Cyan Density"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Adjust the cyan density"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Magenta Density"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Adjust the magenta density"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Yellow Density"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Adjust the yellow density"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Black Density"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Adjust the black density"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Light Cyan Transition"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Advanced Ink Adjustment"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr "Light Magenta Transition"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr "Off"
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Long Edge (Standard)"
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
-#, fuzzy
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 msgid "CD - Custom"
-msgstr "Custom"
+msgstr "CD - Custom"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Black and White"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Manual Control"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "High Accuracy"
@@ -497,9 +539,8 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Grayscale"
 
@@ -515,11 +556,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -579,7 +620,7 @@ msgid "Output image type"
 msgstr "Output image type"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr "Raw Channels"
 
@@ -639,16 +680,56 @@ msgstr "AppGamma"
 msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by application"
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -656,16 +737,56 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -673,16 +794,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Yellow"
 
@@ -690,9 +851,11 @@ msgstr "Yellow"
 msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "Red"
 
@@ -700,7 +863,7 @@ msgstr "Red"
 msgid "Adjust the red gamma"
 msgstr "Adjust the red gamma"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "Green"
 
@@ -708,9 +871,10 @@ msgstr "Green"
 msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "Blue"
 
@@ -719,16 +883,54 @@ msgid "Adjust the blue gamma"
 msgstr "Adjust the blue gamma"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Black"
 
@@ -736,7 +938,7 @@ msgstr "Black"
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "Cyan Balance"
 
@@ -749,7 +951,7 @@ msgstr "GrayBalance"
 msgid "Adjust the cyan gray balance"
 msgstr "Adjust the cyan gray balance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "Magenta Balance"
 
@@ -757,7 +959,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "Yellow Balance"
 
@@ -784,10 +986,11 @@ msgstr "Ink Limit"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr "Advanced Output Control"
 
@@ -795,37 +998,37 @@ msgstr "Advanced Output Control"
 msgid "Limit the total ink printed to the page"
 msgstr "Limit the total ink printed to the page"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr "GCR Transition"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr "Adjust the gray component transition rate"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr "GCR Lower Bound"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr "Lower bound of gray component reduction"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr "GCR Upper Bound"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr "Upper bound of gray component reduction"
 
 #: src/main/print-color.c:421
 msgid "LUT dump file"
-msgstr ""
+msgstr "LUT dump file"
 
 #: src/main/print-color.c:422
 msgid "Dump file for LUT for external color adjustment"
-msgstr ""
+msgstr "Dump file for LUT for external color adjustment"
 
 #: src/main/print-color.c:455 src/main/print-color.c:465
 #: src/main/print-color.c:473 src/main/print-color.c:481
@@ -944,77 +1147,77 @@ msgstr "Gray component reduction curve"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Value must be set for %s\n"
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' is not a valid %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s must be between %f and %f (is %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s must be between %d and %d (is %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s bounds must be between %f and %f\n"
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s wrap mode must be %s\n"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr "no wrap"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr "wrap around"
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unknown type parameter %s (%d)\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s out of range (value %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "Page size is not valid\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Top margin must not be less than %d\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Left margin must not be less than %d\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr "Height must be greater than zero\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr "Width must be greater than zero\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1023,7 +1226,7 @@ msgstr ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1032,388 +1235,429 @@ msgstr ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr "Automatic Printing Mode"
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr "Basic Output Adjustment"
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "Automatic printing mode"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "Print Quality"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "Resolution of the print"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr "Enhanced Gloss"
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr "Add gloss enhancement"
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr "Ink Set"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "Printing Direction"
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr "Advanced Output Adjustment"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printing direction (unidirectional is higher quality, but slower)"
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr "Borderless"
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr "Print without borders"
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr "Interleave Method"
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr "Interleave pattern to use"
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr "Adjust dot size as necessary"
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr "Adjust dot size as necessary to achieve desired density"
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr "Output Order"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr "Alignment Passes"
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr "Alignment Choices"
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr "Ink change command"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr "Alternate Alignment Passes"
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr "Alternate Alignment Choices"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr "Supports Packet Mode"
 
-#: src/main/print-escp2.c:320
-#, fuzzy
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
-msgstr "Supports Packet Mode"
+msgstr "Supports D4 Packet Mode"
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
-msgstr ""
+msgstr "Has Interchangeable Ink Cartridges"
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
-msgstr ""
+msgstr "Has multiple choices of ink cartridges"
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr "Channel Names"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr "Raw Channel Count"
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr "Cyan Map"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr "Adjust the cyan map"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr "Magenta Map"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr "Adjust the magenta map"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr "Yellow Map"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr "Adjust the yellow map"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr "Blue Map"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr "Adjust the blue map"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+msgid "Orange Map"
+msgstr "Orange Map"
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the orange map"
+msgstr "Adjust the orange map"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr "Red Map"
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr "Adjust the red map"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Red Density"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Adjust the red density"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Blue Density"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Adjust the blue density"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+msgid "Orange Density"
+msgstr "Orange Density"
+
+#: src/main/print-escp2.c:488
+msgid "Adjust the orange density"
+msgstr "Adjust the orange density"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr "Gloss Level"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr "Adjust the gloss level"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
-msgstr ""
+msgstr "Drop Size Small"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
-msgstr ""
+msgstr "Drop Size 1 (small)"
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
-msgstr ""
+msgstr "Drop Size Medium"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
-msgstr ""
+msgstr "Drop Size 2 (medium)"
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
-msgstr ""
+msgstr "Drop Size Large"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
-msgstr ""
+msgstr "Drop Size 3 (large)"
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
-#, fuzzy
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Light Cyan Value"
-msgstr "Light Cyan"
+msgstr "Light Cyan Value"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
-#, fuzzy
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Light Cyan Density Scale"
-msgstr "Cyan Density"
+msgstr "Light Cyan Density Scale"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
-#, fuzzy
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 msgid "Light Magenta Value"
-msgstr "Light Magenta"
+msgstr "Light Magenta Value"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
-#, fuzzy
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Magenta Density Scale"
-msgstr "Magenta Density"
+msgstr "Light Magenta Density Scale"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
-#, fuzzy
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 msgid "Dark Yellow Value"
-msgstr "Dark Yellow"
+msgstr "Dark Yellow Value"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr "Dark Yellow Transition"
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
-#, fuzzy
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 msgid "Dark Yellow Density Scale"
-msgstr "Yellow Density"
+msgstr "Dark Yellow Density Scale"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
-#, fuzzy
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 msgid "Gray Value"
-msgstr "Grayscale"
+msgstr "Gray Value"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 msgstr "Gray Transition"
 
-#: 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 msgid "Gray Density Scale"
-msgstr "Grayscale"
+msgstr "Gray Density Scale"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
-#, fuzzy
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
-msgstr "Light Gray Transition"
+msgstr "Light Gray Value"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 msgstr "Light Gray Transition"
 
-#: 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
-msgstr "Light Gray Transition"
+msgstr "Light Gray Density Scale"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
-#, fuzzy
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
-msgstr "Dark Gray Transition"
+msgstr "Dark Gray Value"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr "Dark Gray Transition"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
-#, fuzzy
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
-msgstr "Dark Gray Transition"
+msgstr "Dark Gray Density Scale"
 
-#: src/main/print-escp2.c:694
-#, fuzzy
+#: src/main/print-escp2.c:695
 msgid "Mid Gray Value"
-msgstr "Grayscale"
+msgstr "Mid Gray Value"
 
-#: src/main/print-escp2.c:695
-#, fuzzy
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
-msgstr "Medium Gray Transition"
+msgstr "Medium Gray Value"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr "Mid Gray Transition"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:710
-#, fuzzy
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
-msgstr "Mid Gray Transition"
+msgstr "Mid Gray Density Scale"
 
-#: src/main/print-escp2.c:711
-#, fuzzy
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
-msgstr "Medium Gray Transition"
+msgstr "Medium Gray Density Scale"
+
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr "Drying Time Per Page"
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr "Set drying time per page"
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr "Drying Time Per Scan"
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr "Set drying time per scan"
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr "Minimum Drying Time Per Scan"
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr "Set minimum drying time per scan"
+
+#: src/main/print-escp2.c:799
+msgid "Paper Thickness"
+msgstr "Paper Thickness"
+
+#: src/main/print-escp2.c:800
+msgid "Set printer paper thickness"
+msgstr "Set printer paper thickness"
+
+#: src/main/print-escp2.c:807
+msgid "Vacuum Intensity"
+msgstr "Vacuum Intensity"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr "Set vacuum intensity (printer-specific)"
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr "Feed Sequence"
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr "Set paper feed sequence (printer-specific)"
+
+#: src/main/print-escp2.c:823
+msgid "Print Method"
+msgstr "Print Method"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr "Set print method (printer-specific)"
+
+#: src/main/print-escp2.c:831
+msgid "Platen Gap"
+msgstr "Platen Gap"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr "Set platen gap (printer-specific)"
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr "Feed Adjustment"
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr "Set paper feed adjustment (0.01% units)"
+
+#: src/main/print-escp2.c:1964
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:2001
+#: src/main/print-escp2.c:1966
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Manual Control"
-
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr "Short Edge(Flip)"
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
 
@@ -1466,129 +1710,356 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Four Colour Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Three Colour Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Six Colour Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Plain Paper"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Transparencies"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Other"
 
@@ -1604,170 +2075,193 @@ msgstr "Manual with Pause"
 msgid "Manual without Pause"
 msgstr "Manual without Pause"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr "None"
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr "Glossy"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr "Matte"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr "Laminate Pattern"
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "Black Balance"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "Adjust the black balance"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Plain"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Glossy Photo"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Transparency"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Quick-dry Photo"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Quick-dry Transparency"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manual"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
-msgstr ""
+msgstr "Tray 1 - Movable Guides"
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Tray 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
-msgstr ""
+msgstr "Tray 2 - Movable Guides"
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Tray 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
-msgstr ""
+msgstr "Tray 3 - Movable Guides"
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Tray 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
-msgstr ""
+msgstr "Tray 4 - Movable Guides"
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Tray 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Portable Sheet Feeder"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Desktop Sheet Feeder"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Tray"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Optional Source"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Autoselect"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI monochrome"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr "Draft"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr "High"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "Photo"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Colour + Black Cartridges"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Colour + Photo Cartridges"
 
@@ -1775,6757 +2269,9750 @@ msgstr "Colour + Photo Cartridges"
 msgid "PPDFile"
 msgstr "PPDFile"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "PPD File"
 
-#: src/main/print-ps.c:74
-#, fuzzy
+#: src/main/print-ps.c:80
 msgid "Model Name"
-msgstr "Channel Names"
+msgstr "Model Name"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
+msgstr "PPD File Model Name"
+
+#: src/main/print-ps.c:316
+msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Custom"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Two Level Grayscale"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr "Fast Economy"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
-msgstr "Three Level Grayscale"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr "Economy"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
+msgstr "Super Photo"
 
-#: src/main/escp2-channels.c:1466
-#, fuzzy
-msgid "Four Color Photo"
-msgstr "Six Colour Photo"
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
+msgstr "Ultra Photo"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Six Colour Enhanced Composite"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr "Best"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Seven Colour Photo"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Text"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Seven Colour Enhanced"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Graphics"
 
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
-msgstr "Eight Colour Photo"
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Mixed Text and Graphics"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "One Colour Raw"
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Photograph"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
-msgstr "One Colour Raw Enhanced Gloss"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Line Art"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "Two Colour Raw"
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Page"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
-msgstr "Three Colour Raw"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Job"
 
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
-msgstr "Three Colour Raw Gloss"
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Image Type"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "Four Colour Raw"
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Type of image being printed"
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
-msgstr "Four Colour Raw Gloss"
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Job Mode"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
-msgstr "Five Colour Raw"
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Job vs. page mode"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Six Colour Raw"
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Page Number"
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Six Colour Enhanced Gloss Raw"
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Page number"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Seven Colour Raw"
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Curve type"
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Seven Colour Enhanced Gloss Raw"
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "Is this curve linear, spline interpolated, or free-form"
 
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
-msgstr "Eight Colour Raw"
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Minimum X"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
-msgstr "EPSON Standard Inks"
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Minimum possible value for X"
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
-msgstr "UltraChrome Photo Black"
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Maximum X"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
-msgstr "UltraChrome Matte Black"
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Maximum possible X value"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Minimum Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Minimum possible value for Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Maximum Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Maximum possible value for Y"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gamma value"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Inch"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Set the base unit of measurement to inches"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Set the base unit of measurement to centimetres"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Points"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Set the base unit of measurement to points (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 "Set the base unit of measurement to millimetres"
+
+#: 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 "Set the base unit of measurement to picas (1/12\")"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Colour output"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Print in shades of gray using black ink"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Standard Command"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Use standard print command"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Custom Command"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Use custom print command"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "File"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Print to a file"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Edit Curve…"
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Set Default"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Restore Previous"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+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 "Cancel"
+
+#: src/gutenprintui2/panel.c:642
+msgid "Select File..."
+msgstr "Select File…"
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr "Reset"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Print v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "About"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Print and\n"
+"Save Settings"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Save\n"
+"Settings"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Print"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Preview"
+
+#: 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 ""
+"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."
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Paper Size"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Show All Paper Sizes"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Dimensions:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Width:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Width of the paper that you wish to print to"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Height:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Height of the paper that you wish to print to"
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Automatic Paper Size"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Number of Copies"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Select the number of copies to print; a value between 1 and 100"
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Image Position"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Portrait"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Landscape"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Upside down"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Seascape"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientation:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Left:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Distance from the left of the paper to the image"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Right:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Distance from the left of the paper to the right of the image"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Distance from the right of the paper to the image"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Top:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Distance from the top of the paper to the image"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Bottom:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Distance from the top of the paper to bottom of the image"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Distance from the bottom of the paper to the image"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centre:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centre the image horizontally on the paper"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Both"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centre the image on the paper"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Vertical"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centre the image vertically on the paper"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Setup Printer"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Printer Make:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Select the make of your printer"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Printer Model:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Select your printer model"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD File:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Enter the correct PPD filename for your printer"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Browse"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Choose the correct PPD filename for your printer"
+
+#: 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 ""
+"Select the name of the output queue (not the type, or model, of printer) "
+"that you wish to print to"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Printer Queue:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Enter the correct command to print to your printer. "
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Enter the file to print to. "
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "File to print to"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Print To File"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Define New Printer"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Printer Name:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Enter the name you wish to give this logical printer"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "About Gutenprint "
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Gutenprint Version "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Printer Settings"
+
+#: 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 ""
+"Select the name of the printer (not the type, or model, of printer) that you "
+"wish to print to"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Setup Printer…"
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "New Printer…"
+
+#: 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 ""
+"Define a new logical printer. This can be used to name a collection of "
+"settings that you wish to remember for future use."
+
+#: src/gutenprintui2/panel.c:2150
+msgid "Set Printer Option Defaults"
+msgstr "Set Printer Option Defaults"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr "Set all printer options to their defaults"
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Image Size"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Scaling:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Set the scale (size) of the image"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Scale by:"
+
+#: 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 ""
+"Select whether scaling is measured as percent of available page size or "
+"number of output dots per inch"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Percent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Scale the print to the size of the page"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Scale the print to the number of dots per inch"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Set the width of the print"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Set the height of the print"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Use Original\n"
+"Image Size"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Set the print size to the size of the image"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Print Colour Adjust"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Set Defaults"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Close"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Image preview"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "View Output Channels:"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Output"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Output Type:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Select the desired output type"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Adjust Output…"
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Size Units:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Units:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Select the base unit of measurement for printing"
+
+#: 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/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: 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 "Printer"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Default Printer)"
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr "Printer Features"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr "Output Control"
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr "Common"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr "Extra 1"
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr "Extra 2"
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr "Extra 3"
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr "Extra 4"
+
+#: src/cups/genppd.c:155
+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
+msgid "English"
+msgstr "English-GB"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+msgid "Media Size"
+msgstr "Media Size"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+msgid "Color Model"
+msgstr "Colour Model"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+msgid "Inverted Grayscale"
+msgstr "Inverted Grayscale"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+msgid "RGB Color"
+msgstr "RGB Colour"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY Colour"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr "Colour Precision"
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr "Reverse"
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr "2-Sided Printing"
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr "Shrink Page If Necessary to Fit Borders"
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr "Shrink (print the whole page)"
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr "Crop (preserve dimensions)"
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr "Expand (use maximum page area)"
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "No"
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "Yes"
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr "Value"
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr "Fine Adjustment"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil version "
+
+#: 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-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 Licence as published by the Free\n"
+"Software Foundation; either version 2 of the Licence, 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 Licence\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public Licence\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
+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 ""
+"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 ® 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 licence/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"
+
+#: 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 ""
+"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 ® 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"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "You may only specify one printer or raw device."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "You may only specify one printer model."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Alignment choices must be at least 1."
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Alignment passes must be at least 1."
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Unknown option %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Usage: %s [OPTIONS] command\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Type `%s --help' for more information.\n"
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Type `%s -h' for more information.\n"
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Cannot open device %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Cannot print to printer %s with %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Unable to send command to printer\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Read from printer timed out\n"
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Cannot read from %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr "Please specify a raw device\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Cannot open %s read/write: %s\n"
+
+#: src/escputil/escputil.c:783
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Unknown printer %s!\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Cannot write to %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Cannot write to %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr "Photo Black"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
-msgstr "Matte Black"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "Unknown"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr "Light Cyan"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr "Light Magenta"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr "Light Black"
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
-msgstr "Dark Yellow"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
+msgstr "Matte Black"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr "Light Light Black"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Plain Paper Fast Load"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+msgid "Orange"
+msgstr "Orange"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr "Status: Error\n"
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Status: Self-Printing\n"
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Status: Busy\n"
+
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Status: Waiting\n"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Status: Idle\n"
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Status: Paused\n"
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Status: Cleaning\n"
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Status: Factory shipment\n"
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Status: Shutting down\n"
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Status: Unknown (%d)\n"
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Error: Fatal Error\n"
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Error: Other interface is selected\n"
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Error: Cover Open\n"
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Error: Paper jam\n"
+
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Error: Ink out\n"
+
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Error: Paper out\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Error: Miscellaneous paper error\n"
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr "Error: Maintenance cartridge overflow\n"
+
+#: src/escputil/escputil.c:1084
+#, 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:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Error: Double feed error\n"
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+"Error: Ink cartridge lever released\n"
+"\n"
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Error: Unrecoverable cutter error\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Error: Recoverable cutter jam\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr "Error: No maintenance cartridge present\n"
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Error: Rear cover open\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Error: CD Tray Out\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Error: Card loading error\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Error: Tray cover open\n"
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Error: Maintenance cartridge cover open\n"
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr "Error: Front cover open\n"
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Error: Maintenance request\n"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Error: Unknown (%d)\n"
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Warning: %s Ink Low\n"
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Warning: Channel %d Ink Low\n"
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr "Warning: %s Cleaning Disabled\n"
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr "Warning: Channel %d Cleaning \n"
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr "Warning: Maintenance cartridge near full\n"
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr "Warning: Maintenance request pending\n"
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Warning: Unknown (%d)\n"
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Printing nozzle self-test\n"
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Ink Levels:\n"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Ink colour"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Percent remaining"
+
+#: src/escputil/escputil.c:1298
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr "Printer Name: %s\n"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr "Job Name: "
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr "ink levels"
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "status"
+
+#: src/escputil/escputil.c:1393
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Obtaining %s requires using a raw device.\n"
+
+#: src/escputil/escputil.c:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr "Ink cartridge"
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr "Part number"
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "Date"
+
+#: src/escputil/escputil.c:1713
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr "Printer identification requires using a raw device.\n"
+
+#: src/escputil/escputil.c:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Cannot identify printer model.\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Cleaning heads…\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr "Exiting\n"
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Repeating the alignment process.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "About to save settings…"
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "failed!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "succeeded!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Unrecognised command.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Final command was not confirmed.\n"
+
+#: src/escputil/escputil.c:1950
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Press enter to continue > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Pass #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Please insert a fresh sheet of paper.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Number out of range!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "I cannot understand what you typed!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Attempting to set alignment…"
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "succeeded.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"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"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Error in input\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Printing…"
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr "EPSON Standard Inks"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+msgid "Bright White Paper"
+msgstr "Bright White Paper"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Postcard"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 msgid "Matte Paper Heavyweight"
 msgstr "Matte Paper Heavyweight"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr "Premium Presentation Paper Matte"
+
+#: src/xml/xmli18n-tmp.h:27
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premium Glossy Photo Paper 170 wt"
+
+#: src/xml/xmli18n-tmp.h:29
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premium Glossy Photo Paper 250 wt"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+msgid "Ultra Glossy Photo Paper"
+msgstr "Ultra Glossy Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Semigloss Photo Paper"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:35
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Premium Semigloss Photo Paper 170 wt"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Premium Semigloss Photo Paper 250 wt"
+
+#: src/xml/xmli18n-tmp.h:41
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Premium Lustre Photo Paper 250 wt"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Ultra Premium Photo Paper Lustre"
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Plain Paper Fast Load"
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
 msgid "Archival Matte Paper"
 msgstr "Archival Matte Paper"
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
 msgid "Watercolor Paper - Radiant White"
 msgstr "Watercolour Paper - Radiant White"
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Roll Feed"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr "Roll Feed (cut each page)"
-
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr "Roll Feed (do not cut)"
-
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "Manual Feed"
-
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "Print to CD"
-
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
-msgstr "Manual Sheet Guide"
-
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-msgid "Manual Feed (Front)"
-msgstr "Manual Feed (Front)"
-
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
-msgstr "Rear Tray"
-
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr "Front Tray"
-
-#: src/main/escp2-papers.c:1988
-msgid "Photo Board"
-msgstr "Photo Board"
-
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr "Cut Sheet Bin 1"
-
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
-msgstr "Cut Sheet Bin 2"
-
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
-msgstr "Cut Sheet Autoselect"
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
+msgstr "UltraChrome Photo Black"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
-msgstr "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr "UltraChrome Matte Black"
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 × 90 DPI Fast Economy"
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
-msgstr "360 × 120 DPI Economy"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr "180 DPI Economy"
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 msgid "360 x 180 DPI Draft"
 msgstr "360 × 180 DPI Draft"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
-msgstr "360 × 240 DPI Draft"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 DPI High Quality"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 × 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr "720 DPI High Quality"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
+msgstr "360 × 120 DPI Economy"
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 DPI Highest Quality"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr "360 × 240 DPI Draft"
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
-msgstr "720 × 720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr "720 DPI High Quality"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 720 DPI Highest Quality"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 × 720 DPI Transposed"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI Highest Quality"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 × 720 DPI Highest Quality"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 × 1440 DPI Transposed"
-
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
-msgstr "5760 × 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr "Dark Yellow"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
+msgstr "5760 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr "5760 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr "On"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 × 720 DPI Transposed"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
-msgstr "Interleave"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 × 360 DPI Enhanced"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2922
+msgid "Black 1"
+msgstr "Black 1"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
-msgstr "Four Pass"
+#: src/xml/xmli18n-tmp.h:2923
+msgid "Black 2"
+msgstr "Black 2"
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
-msgstr "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+msgid "360 DPI Enhanced"
+msgstr "360 DPI Enhanced"
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
-msgstr "Interleave 2"
+#: src/xml/xmli18n-tmp.h:2959
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 × 720 DPI High Quality"
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
-msgstr "Eight Pass"
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
+msgstr "Rear Tray"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
+msgstr "Front Tray"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Economy"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "Manual Feed"
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Draft"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "Print to CD"
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
-msgstr "High"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr "Roll Feed (cut each page)"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Photo"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
+msgstr "Roll Feed (do not cut)"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super Photo"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Roll Feed"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra Photo"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
+msgstr "Manual Sheet Guide"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr "Best"
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+msgid "Manual Feed (Front)"
+msgstr "Manual Feed (Front)"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr "Text"
+#: src/xml/xmli18n-tmp.h:3104
+msgid "Photo Board"
+msgstr "Photo Board"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr "Graphics"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr "Cut Sheet Bin 1"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr "Mixed Text and Graphics"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr "Cut Sheet Bin 2"
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "Photograph"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
+msgstr "Cut Sheet Autoselect"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Line Art"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr "Manual Selection"
 
-#: src/main/generic-options.c:55
-msgid "Page"
-msgstr "Page"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "One Colour Raw"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr "Job"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
+msgstr "Three Colour Raw"
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
-msgstr "Image Type"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "Four Colour Raw"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
-msgstr "Type of image being printed"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
+msgstr "Five Colour Raw"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
-msgstr "Job Mode"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Six Colour Raw"
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
-msgstr "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
+msgstr "One Colour Raw Enhanced Gloss"
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
-msgstr "Page Number"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
+msgstr "Three Colour Raw Gloss"
 
-#: src/main/generic-options.c:81
-msgid "Page number"
-msgstr "Page number"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
+msgstr "Four Colour Raw Gloss"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Six Colour Enhanced Gloss Raw"
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Seven Colour Enhanced Gloss Raw"
+
+#: src/xml/xmli18n-tmp.h:3210
+msgid "Default Black"
+msgstr "Default Black"
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Seven Colour Photo"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Six Colour Enhanced Composite"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Seven Colour Raw"
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Two Level Grayscale"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "Two Colour Raw"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr "Eight Colour Photo"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr "Eight Colour Raw"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+msgid "Four Color Photo"
+msgstr "Four Colour Photo"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
+msgstr "Interleave"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr "Full Overlap"
+
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr "Four Pass"
+
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr "Full Overlap 2"
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr "Interleave 2"
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr "Eight Pass"
+
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr "On"
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
-msgstr ""
+msgstr "3½×5"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper (tear-off borders)"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17×22"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22×30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24×36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3658
 msgid "C0 landscape"
-msgstr "Landscape"
+msgstr "C0 landscape"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3660
 msgid "C1 landscape"
-msgstr "Landscape"
+msgstr "C1 landscape"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3662
 msgid "C2 landscape"
-msgstr "Landscape"
+msgstr "C2 landscape"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3664
 msgid "C3 landscape"
-msgstr "Landscape"
+msgstr "C3 landscape"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3666
 msgid "C4 landscape"
-msgstr "Landscape"
+msgstr "C4 landscape"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3668
 msgid "C5 landscape"
-msgstr "Landscape"
+msgstr "C5 landscape"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3670
 msgid "B6-C4 landscape"
-msgstr "Landscape"
+msgstr "B6-C4 landscape"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3672
 msgid "C6 landscape"
-msgstr "Landscape"
+msgstr "C6 landscape"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3674
 msgid "DL landscape"
-msgstr "Landscape"
+msgstr "DL landscape"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3676
 msgid "C7-6 landscape"
-msgstr "Landscape"
+msgstr "C7-6 landscape"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3678
 msgid "C7 landscape"
-msgstr "Landscape"
+msgstr "C7 landscape"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3680
 msgid "C8 landscape"
-msgstr "Landscape"
+msgstr "C8 landscape"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3682
 msgid "C9 landscape"
-msgstr "Landscape"
+msgstr "C9 landscape"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3684
 msgid "C10 landscape"
-msgstr "Landscape"
+msgstr "C10 landscape"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr "ArchA transposed"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr "ArchB transposed"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr "ArchC transposed"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr "ArchD transposed"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr "ArchE transposed"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japanese long envelope #3"
 
-#: src/main/xmli18n-tmp.h:137
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
-msgstr "Japanese long envelope #3"
+msgstr "Japanese long envelope #3 landscape"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japanese long envelope #4"
 
-#: src/main/xmli18n-tmp.h:139
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
-msgstr "Japanese long envelope #4"
+msgstr "Japanese long envelope #4 landscape"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku envelope #4"
 
-#: src/main/xmli18n-tmp.h:141
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
-msgstr "Japanese Kaku envelope #4"
+msgstr "Japanese Kaku envelope #4 landscape"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
-msgstr "Commercial 10"
+msgstr "Commercial 10 landscape"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/main/xmli18n-tmp.h:146
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3721
 msgid "Monarch Envelope landscape"
-msgstr "Monarch Envelope"
+msgstr "Monarch Envelope landscape"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4×5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4×7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr "Card"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Custom"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr "17 Inch Roll Paper"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr "60 Inch Roll Paper"
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr "64 Inch Roll Paper"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:184
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
-msgstr "Canon BJC-1000"
+msgstr "Canon BJC-5100"
 
-#: src/main/xmli18n-tmp.h:185
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
-msgstr "Canon BJC-6500"
+msgstr "Canon BJC-5500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:193
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
-msgstr "Canon BJC-6500"
+msgstr "Canon BJC-8500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP2000"
 
-#: src/main/xmli18n-tmp.h:205
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/main/xmli18n-tmp.h:206
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA iP3100"
 
-#: src/main/xmli18n-tmp.h:207
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP4000"
 
-#: src/main/xmli18n-tmp.h:208
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP4100"
 
-#: src/main/xmli18n-tmp.h:209
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP4200"
 
-#: src/main/xmli18n-tmp.h:210
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP4300"
 
-#: src/main/xmli18n-tmp.h:211
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP4500"
 
-#: src/main/xmli18n-tmp.h:212
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP5000"
 
-#: src/main/xmli18n-tmp.h:213
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
-msgstr "Canon CP-200"
+msgstr "Canon PIXMA iP5200"
 
-#: src/main/xmli18n-tmp.h:214
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP5300"
 
-#: src/main/xmli18n-tmp.h:215
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP6000D"
 
-#: src/main/xmli18n-tmp.h:216
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP6700"
 
-#: src/main/xmli18n-tmp.h:217
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iP8500"
 
-#: src/main/xmli18n-tmp.h:218
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA iX5000"
 
-#: src/main/xmli18n-tmp.h:219
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA Pro9500"
 
-#: src/main/xmli18n-tmp.h:220
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA MP150"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
 #, fuzzy
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA MP170"
 
-#: src/main/xmli18n-tmp.h:222
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA MP180"
 
-#: src/main/xmli18n-tmp.h:223
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP500"
 
-#: src/main/xmli18n-tmp.h:224
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA MP520"
 
-#: src/main/xmli18n-tmp.h:225
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA MP610"
 
-#: src/main/xmli18n-tmp.h:226
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP700"
 
-#: src/main/xmli18n-tmp.h:227
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
-msgstr "Canon CP-300"
+msgstr "Canon PIXMA MP710"
 
-#: src/main/xmli18n-tmp.h:228
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP730"
 
-#: src/main/xmli18n-tmp.h:229
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP740"
 
-#: src/main/xmli18n-tmp.h:230
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP750"
 
-#: src/main/xmli18n-tmp.h:231
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP760"
 
-#: src/main/xmli18n-tmp.h:232
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP770"
 
-#: src/main/xmli18n-tmp.h:233
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP780"
 
-#: src/main/xmli18n-tmp.h:234
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP790"
 
-#: src/main/xmli18n-tmp.h:235
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
-msgstr "Canon iP4000"
+msgstr "Canon PIXMA MP830"
 
-#: src/main/xmli18n-tmp.h:236
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
-msgstr "Canon S100"
+msgstr "Canon PIXUS iP3100"
 
-#: src/main/xmli18n-tmp.h:237
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
-msgstr "Canon iP4000"
+msgstr "Canon PIXUS iP4100"
 
-#: src/main/xmli18n-tmp.h:238
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
-msgstr "Canon S450"
+msgstr "Canon i80"
 
-#: src/main/xmli18n-tmp.h:239
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
-msgstr "Canon S450"
+msgstr "Canon i560"
 
-#: src/main/xmli18n-tmp.h:240
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
-msgstr "Canon S450"
+msgstr "Canon i850"
 
-#: src/main/xmli18n-tmp.h:241
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
-msgstr "Canon S600"
+msgstr "Canon i860"
 
-#: src/main/xmli18n-tmp.h:242
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
-msgstr "Canon BJC-85"
+msgstr "Canon i865"
+
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson E 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+msgid "Epson B-300"
+msgstr "Epson B-300"
+
+#: src/xml/xmli18n-tmp.h:3825
+msgid "Epson B-308"
+msgstr "Epson B-308"
+
+#: src/xml/xmli18n-tmp.h:3826
+msgid "Epson B-500DN"
+msgstr "Epson B-500DN"
+
+#: src/xml/xmli18n-tmp.h:3827
+msgid "Epson B-508DN"
+msgstr "Epson B-508DN"
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3859
 msgid "Epson Stylus C79"
-msgstr "Epson Stylus C70"
+msgstr "Epson Stylus C79"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3866
 msgid "Epson Stylus C87"
-msgstr "Epson Stylus C48"
+msgstr "Epson Stylus C87"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:283
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3868
 msgid "Epson Stylus C110"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus C110"
 
-#: src/main/xmli18n-tmp.h:284
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3869
 msgid "Epson Stylus C120"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus C120"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3940
 msgid "Epson Stylus Photo 1400"
-msgstr "Epson Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1400"
 
-#: src/main/xmli18n-tmp.h:345
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3941
 msgid "Epson Stylus Photo 1410"
-msgstr "Epson Stylus Photo 810"
+msgstr "Epson Stylus Photo 1410"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:352
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3948
 msgid "Epson Stylus Photo R230"
-msgstr "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R230"
 
-#: src/main/xmli18n-tmp.h:353
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3949
 msgid "Epson Stylus Photo R240"
-msgstr "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R240"
 
-#: src/main/xmli18n-tmp.h:354
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3950
 msgid "Epson Stylus Photo R245"
-msgstr "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo R245"
 
-#: src/main/xmli18n-tmp.h:355
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3951
 msgid "Epson Stylus Photo R260"
-msgstr "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R260"
 
-#: src/main/xmli18n-tmp.h:356
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3952
 msgid "Epson Stylus Photo R265"
-msgstr "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo R265"
 
-#: src/main/xmli18n-tmp.h:357
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3953
 msgid "Epson Stylus Photo R270"
-msgstr "Epson Stylus Photo 1270"
+msgstr "Epson Stylus Photo R270"
 
-#: src/main/xmli18n-tmp.h:358
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3954
 msgid "Epson Stylus Photo R280"
-msgstr "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo R280"
 
-#: src/main/xmli18n-tmp.h:359
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3955
 msgid "Epson Stylus Photo R285"
-msgstr "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo R285"
+
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:364
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3961
 msgid "Epson Stylus Photo R350"
-msgstr "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R350"
 
-#: src/main/xmli18n-tmp.h:365
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3962
 msgid "Epson Stylus Photo R360"
-msgstr "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R360"
 
-#: src/main/xmli18n-tmp.h:366
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3963
 msgid "Epson Stylus Photo R380"
-msgstr "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R380"
 
-#: src/main/xmli18n-tmp.h:367
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3964
 msgid "Epson Stylus Photo R390"
-msgstr "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R390"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1900"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3975
 msgid "Epson Stylus Photo RX560"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX560"
 
-#: src/main/xmli18n-tmp.h:375
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3976
 msgid "Epson Stylus Photo RX580"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX580"
 
-#: src/main/xmli18n-tmp.h:376
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3977
 msgid "Epson Stylus Photo RX585"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX585"
 
-#: src/main/xmli18n-tmp.h:377
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3978
 msgid "Epson Stylus Photo RX590"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX590"
 
-#: src/main/xmli18n-tmp.h:378
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3979
 msgid "Epson Stylus Photo RX595"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX595"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3984
 msgid "Epson Stylus Photo RX640"
-msgstr "Epson Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX640"
 
-#: src/main/xmli18n-tmp.h:383
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3985
 msgid "Epson Stylus Photo RX680"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX680"
 
-#: src/main/xmli18n-tmp.h:384
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3986
 msgid "Epson Stylus Photo RX685"
-msgstr "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX685"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX560"
+
+#: src/xml/xmli18n-tmp.h:3988
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
-msgstr "Epson Stylus Photo R800"
-
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7800"
+
+#: src/xml/xmli18n-tmp.h:3997
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7880"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9800"
+
+#: src/xml/xmli18n-tmp.h:4002
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9880"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11880"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:412
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4019
 msgid "Epson Stylus CX4400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4400"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:417
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4024
 msgid "Epson Stylus CX4900"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4900"
 
-#: src/main/xmli18n-tmp.h:418
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4025
 msgid "Epson Stylus CX5000"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus CX5000"
 
-#: src/main/xmli18n-tmp.h:419
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4026
 msgid "Epson Stylus CX5000F"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus CX5000F"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
 #, fuzzy
-msgid "Epson Stylus CX5600"
+msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4032
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX5600"
+
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:427
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4035
 msgid "Epson Stylus CX6000"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus CX6000"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4040
 msgid "Epson Stylus CX7000F"
-msgstr "Epson Stylus CX3700"
+msgstr "Epson Stylus CX7000F"
 
-#: src/main/xmli18n-tmp.h:433
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4041
 msgid "Epson Stylus CX7400"
-msgstr "Epson Stylus CX3700"
+msgstr "Epson Stylus CX7400"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
 #, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 msgid "Epson Stylus CX9400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:441
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4052
 msgid "Epson Stylus D92"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus D92"
 
-#: src/main/xmli18n-tmp.h:442
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4053
 msgid "Epson Stylus D120"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus D120"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:445
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4056
 msgid "Epson Stylus DX4050"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4050"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:448
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4059
 msgid "Epson Stylus DX4400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus DX4400"
 
-#: src/main/xmli18n-tmp.h:449
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4060
 msgid "Epson Stylus DX4450"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4450"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:451
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4062
 msgid "Epson Stylus DX7000F"
-msgstr "Epson Stylus CX3700"
+msgstr "Epson Stylus DX7000F"
 
-#: src/main/xmli18n-tmp.h:452
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4063
 msgid "Epson Stylus DX7400"
-msgstr "Epson Stylus CX3700"
+msgstr "Epson Stylus DX7400"
 
-#: src/main/xmli18n-tmp.h:453
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4064
 msgid "Epson Stylus DX7450"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX7450"
 
-#: src/main/xmli18n-tmp.h:454
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4065
 msgid "Epson Stylus DX8400"
-msgstr "Epson Stylus CX8400"
+msgstr "Epson Stylus DX8400"
 
-#: src/main/xmli18n-tmp.h:455
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4066
 msgid "Epson Stylus DX8450"
-msgstr "Epson Stylus DX3850"
+msgstr "Epson Stylus DX8450"
+
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Epson Stylus CX7000F"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:457
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate Dash"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:459
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate Flash"
 
-#: src/main/xmli18n-tmp.h:460
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate Pal"
 
-#: src/main/xmli18n-tmp.h:461
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate Snap"
 
-#: src/main/xmli18n-tmp.h:462
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 100"
 
-#: src/main/xmli18n-tmp.h:463
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 200"
 
-#: src/main/xmli18n-tmp.h:464
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 210"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
 #, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 240"
 
-#: src/main/xmli18n-tmp.h:466
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 250"
 
-#: src/main/xmli18n-tmp.h:467
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 260"
 
-#: src/main/xmli18n-tmp.h:468
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 270"
 
-#: src/main/xmli18n-tmp.h:469
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 280"
 
-#: src/main/xmli18n-tmp.h:470
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 290"
 
-#: src/main/xmli18n-tmp.h:471
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 500"
 
-#: src/main/xmli18n-tmp.h:472
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
-msgstr "Epson PictureMate"
+msgstr "Epson PictureMate 2005"
+
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:479
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
-msgstr "Epson E 100"
+msgstr "Epson E 300"
 
-#: src/main/xmli18n-tmp.h:480
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
-msgstr "Epson E 100"
+msgstr "Epson E 500"
 
-#: src/main/xmli18n-tmp.h:481
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
-msgstr "Epson E 150"
+msgstr "Epson E 520"
 
-#: src/main/xmli18n-tmp.h:482
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
-msgstr "Epson E 100"
+msgstr "Epson E 700"
 
-#: src/main/xmli18n-tmp.h:483
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
-msgstr "Epson E 200"
+msgstr "Epson E 720"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:495
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
-msgstr "Epson PM 700C"
+msgstr "Epson PM 670C"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:526
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
-msgstr "Epson PM A890"
+msgstr "Epson PM A820"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:534
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
-msgstr "Epson PM 870C"
+msgstr "Epson PM D870"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:541
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
-msgstr "Epson PM G800"
+msgstr "Epson PM G850"
 
-#: src/main/xmli18n-tmp.h:542
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
-msgstr "Epson PM G700"
+msgstr "Epson PM G4500"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+msgid "Epson Offirio PX B300"
+msgstr "Epson Offirio PX B300"
+
+#: src/xml/xmli18n-tmp.h:4183
+msgid "Epson Offirio PX B500"
+msgstr "Epson Offirio PX B500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+msgid "Epson PX G5300"
+msgstr "Epson PX G5300"
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:550
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
-msgstr "Epson PM 780C"
+msgstr "Epson PX V780"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
-msgstr "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-8045D"
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
-msgstr "Brother HL-10V"
-
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
-msgstr "Brother HL-10h"
-
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
-msgstr "Brother HL-630"
-
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
-msgstr "Brother HL-660"
-
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
-msgstr "Brother HL-760"
-
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
-msgstr "Brother HL-960"
-
-#: src/main/xmli18n-tmp.h:574
+#: src/xml/xmli18n-tmp.h:4212
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:4213
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:4214
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:4215
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:4218
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/xml/xmli18n-tmp.h:4219
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/xml/xmli18n-tmp.h:4220
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:4221
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
+msgstr "Brother HL-1430"
+
+#: src/xml/xmli18n-tmp.h:4223
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
+msgstr "Brother HL-1450"
+
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1470N"
+
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
+msgstr "Brother HL-1650"
+
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1670N"
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr "Brother HL-1850"
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1870N"
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr "Brother HL-2460"
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr "Brother HL-2460N"
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr "Brother HL-5030"
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr "Brother HL-5040"
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr "Brother HL-5050"
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr "Brother HL-5070N"
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr "Brother HL-5140"
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr "Brother HL-5150D"
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-5170DN"
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr "Brother HL-7050"
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr "Brother HL-7050N"
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-N2050"
+
+#: src/xml/xmli18n-tmp.h:4282
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-N2050+"
+
+#: src/xml/xmli18n-tmp.h:4283
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-N2050PS"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-N2050PS+"
+
+#: src/xml/xmli18n-tmp.h:4285
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-N2120"
+
+#: src/xml/xmli18n-tmp.h:4286
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-N2500"
+
+#: src/xml/xmli18n-tmp.h:4287
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-N2500PS"
+
+#: src/xml/xmli18n-tmp.h:4288
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-N2750"
+
+#: src/xml/xmli18n-tmp.h:4289
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-N2750PS"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:623
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4295
 msgid "Generic PCL 4 LF Printer"
-msgstr "Generic PCL 4 Printer"
+msgstr "Generic PCL 4 LF Printer"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:625
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4297
 msgid "Generic PCL 5 LF Printer"
-msgstr "Generic PCL 5 Printer"
+msgstr "Generic PCL 5 LF Printer"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:627
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4299
 msgid "Generic PCL 5c LF Printer"
-msgstr "Generic PCL 5c Printer"
+msgstr "Generic PCL 5c LF Printer"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:629
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4301
 msgid "Generic PCL 5e LF Printer"
-msgstr "Generic PCL 5e Printer"
+msgstr "Generic PCL 5e LF Printer"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:631
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4303
 msgid "Generic PCL 6/PCL XL LF Printer"
-msgstr "Generic PCL 6/PCL XL Printer"
+msgstr "Generic PCL 6/PCL XL LF Printer"
+
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr "Gestetner 10512"
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr "Gestetner 2212"
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr "Gestetner 2712"
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr "Gestetner 3212"
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr "Gestetner 3502"
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr "Gestetner 3532"
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr "Gestetner 4235g"
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr "Gestetner 4502"
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr "Gestetner 4532"
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr "Gestetner 4245g"
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr "Gestetner 6002"
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr "Gestetner 7502"
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr "Gestetner 9002"
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr "Gestetner DSm415"
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr "Gestetner DSm615"
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr "Gestetner DSm616"
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr "Gestetner DSm618"
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr "Gestetner DSm618d"
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr "Gestetner DSm620"
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr "Gestetner DSm620d"
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr "Gestetner DSm622"
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr "Gestetner DSm627"
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr "Gestetner DSm635"
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr "Gestetner DSm635G"
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr "Gestetner DSm645"
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr "Gestetner DS645G"
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr "Gestetner DSm651"
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr "Gestetner DSm660"
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr "Gestetner DSm675"
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr "Gestetner DSm725"
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr "Gestetner DSm730"
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr "Gestetner DSm735"
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr "Gestetner DSm735G"
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr "Gestetner DSm745"
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr "Gestetner DSm745G"
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr "Gestetner MP1100"
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr "Gestetner DSm7110"
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr "Gestetner MP1350"
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr "Gestetner DSm7135"
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr "Gestetner MP1600"
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr "Gestetner DSm716"
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr "Gestetner MP2000"
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr "Gestetner DSm721d"
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr "Gestetner MP2500"
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr "Gestetner DSm625"
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr "Gestetner MP3500"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr "Gestetner DSm735e"
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr "Gestetner MP4500"
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr "Gestetner DSm745e"
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr "Gestetner MP5500"
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr "Gestetner DSm755"
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr "Gestetner MP6500"
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr "Gestetner DSm765"
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr "Gestetner MP7500"
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr "Gestetner DSm775"
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr "Gestetner MP9000"
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr "Gestetner DSm790"
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr "Gestetner MP 161"
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr "Gestetner DSm416"
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr "Gestetner MP 2510"
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr "Gestetner DSm725e"
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr "Gestetner MP 2550"
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr "Gestetner MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr "Gestetner MP 3010"
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr "Gestetner DSm730e"
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr "Gestetner MP 3350"
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr "Gestetner MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr "Gestetner MP 4000"
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr "Gestetner MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr "Gestetner MP 5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr "Gestetner MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:777
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
-msgstr "HP LaserJet 1012"
+msgstr "HP LaserJet 1022"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1160"
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1320"
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2410"
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 2420"
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2430"
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 3015"
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 3020"
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 3030"
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 3050"
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 3052"
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3055"
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3380"
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3390"
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 3392"
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4240"
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4250"
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4345 mfp"
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4350"
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 5200"
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 5200L"
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9040"
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 9040 MFP"
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 9050"
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 9050 MFP"
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet M3027 MFP"
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet M3035 MFP"
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet M4345 MFP"
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet M5025 MFP"
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet M5035 MFP"
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet P2010"
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet P2015"
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet P3004"
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet P3005"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4353 MF"
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4452 MF"
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr "Infotec IS2022"
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr "Infotec IS2027"
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr "Infotec IS2032"
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr "Infotec IS2035"
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr "Infotec IS2045"
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr "Infotec IS2090"
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr "Infotec IS2105"
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr "Infotec IS 2015"
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr "Infotec IS 2018"
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr "Infotec IS 2018D"
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr "Infotec IS 2060"
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr "Infotec IS 2075"
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr "Infotec IS 2122"
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr "Infotec IS 2127"
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr "Infotec IS 2132"
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr "Infotec IS 2135"
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr "Infotec IS 2145"
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr "Infotec IS 2151"
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr "Infotec IS 2160"
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr "Infotec IS 2175"
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr "Infotec IS 2215"
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr "Infotec IS 2216"
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr "Infotec IS 2220"
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr "Infotec IS 2220D"
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr "Infotec IS 2225"
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr "Infotec IS 2230"
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr "Infotec IS 2235"
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr "Infotec IS 2245"
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr "Infotec IS 2255"
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr "Infotec IS 2265"
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr "Infotec IS 2275"
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr "Infotec IS 2316"
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr "Infotec IS 2320"
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr "Infotec IS 2325"
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr "Infotec IS 2416"
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr "Infotec IS 2425"
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr "Infotec IS 2430"
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr "Infotec IS 2435"
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr "Infotec IS 2445"
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr "Infotec IS 3090"
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr "Infotec IS 3110"
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr "Infotec IS 3135"
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr "Infotec MP 2550"
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr "Infotec MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr "Infotec MP 3350"
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr "Infotec MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr "Infotec MP 4000"
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr "Infotec MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr "Infotec MP 5000"
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr "Infotec MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
+msgstr "Lanier 5622"
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
+msgstr "Lanier 5627"
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
-msgstr "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
+msgstr "Lanier 5632"
 
-#: src/main/xmli18n-tmp.h:937
-#, fuzzy
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
+msgstr "Lanier 5635"
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
-msgstr "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
+msgstr "Lanier 5645"
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
-msgstr "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
+msgstr "Lanier LD0105"
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
-msgstr "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
+msgstr "Lanier LD015"
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
-msgstr "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
+msgstr "Lanier LD035"
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
-msgstr "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
+msgstr "Lanier LD045"
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
-msgstr "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
+msgstr "Lanier LD060"
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
+msgstr "Lanier LD075"
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
+msgstr "Lanier LD090"
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
+msgstr "Lanier LD115"
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
+msgstr "Lanier LD116"
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
+msgstr "Lanier LD118"
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
+msgstr "Lanier LD118d"
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
+msgstr "Lanier LD120"
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
-msgstr "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
+msgstr "Lanier LD120d"
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
-msgstr "Okidata OL400e"
-
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
-msgstr "Okidata OL400ex"
-
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
-msgstr "Okidata OL410e"
-
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
-msgstr "Okidata OL600e"
-
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
-msgstr "Okidata OL610e/S"
-
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
-msgstr "Okidata OL800"
-
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
-msgstr "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
+msgstr "Lanier LD122"
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
-msgstr "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
+msgstr "Lanier LD127"
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
-msgstr "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
+msgstr "Lanier LD132"
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
-msgstr "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
+msgstr "Lanier LD135"
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
-msgstr "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
+msgstr "Lanier LD145"
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
-msgstr "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
+msgstr "Lanier LD151"
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
-msgstr "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
+msgstr "Lanier LD160"
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
-msgstr "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
+msgstr "Lanier LD175"
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
-msgstr "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
+msgstr "Lanier LD225"
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
-msgstr "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
+msgstr "Lanier LD230"
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
-msgstr "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
+msgstr "Lanier LD235"
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
+msgstr "Lanier LD245"
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
-msgstr "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
+msgstr "Lanier MP 2500"
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
-msgstr "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
+msgstr "Lanier LD125"
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
-msgstr "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
+msgstr "Lanier MP 1100"
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
-msgstr "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
+msgstr "Lanier LD1100"
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
-msgstr "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
+msgstr "Lanier MP 1350"
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
-msgstr "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
+msgstr "Lanier LD1135"
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
-msgstr "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
+msgstr "Lanier MP 1600"
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
-msgstr "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
+msgstr "Lanier LD316"
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
-msgstr "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
+msgstr "Lanier MP 161"
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
-msgstr "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
+msgstr "Lanier LD016"
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
-msgstr "Samsung ML-6000"
-
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
-msgstr "Samsung ML-6100"
-
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
-msgstr "Samsung ML-7000"
-
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
-msgstr "Samsung ML-7000N"
-
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
-msgstr "Samsung ML-7000P"
-
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
-msgstr "Samsung ML-7050"
-
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
-msgstr "Samsung QL-5100A"
-
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
-msgstr "Samsung QL-6050"
-
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
-msgstr "Seiko SpeedJET 200"
-
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
-msgstr "Sharp AR-161"
-
-#: src/main/xmli18n-tmp.h:990
-#, fuzzy
-msgid "Sharp AR-M257"
-msgstr "Sharp AR-161"
-
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
-msgstr "Sony IJP-V100"
-
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
-msgstr "Star LS-04"
-
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
-msgstr "Star LaserPrinter 8"
-
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
-msgstr "Tally MT908"
-
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
-msgstr "Xerox Able 1406"
-
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
-msgstr "Xerox DocuPrint 4508"
-
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
-msgstr "Xerox DocuPrint C20"
-
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
-msgstr "Xerox DocuPrint N4512"
-
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr "Xerox DocuPrint N4512PS"
-
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
-msgstr "Xerox DocuPrint P12"
-
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
-msgstr "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
+msgstr "Lanier MP 2000"
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
-msgstr "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
+msgstr "Lanier LD320d"
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
+msgstr "Lanier MP 2510"
 
-#: src/main/xmli18n-tmp.h:1004
-#, fuzzy
-msgid "Xerox WorkCentre M118"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
+msgstr "Lanier LD325"
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
+msgstr "Lanier MP 2550B"
 
-#: src/main/xmli18n-tmp.h:1006
-#, fuzzy
-msgid "Lexmark X73"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
+msgstr "Lanier LD425B"
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
+msgstr "Lanier MP 2550"
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
+msgstr "Lanier LD425"
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
+msgstr "Lanier MP 3010"
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
+msgstr "Lanier LD330"
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
+msgstr "Lanier MP 3350B"
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
-msgstr "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
+msgstr "Lanier LD433B"
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
-msgstr "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
+msgstr "Lanier MP 3350"
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
-msgstr "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
+msgstr "Lanier LD433"
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
-msgstr "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
+msgstr "Lanier MP 3500"
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
-msgstr "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
+msgstr "Lanier LD335"
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
-msgstr "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr "Lanier MP 4000B"
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
-msgstr "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
+msgstr "Lanier LD040B"
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
-msgstr "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
+msgstr "Lanier MP 4000"
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
-msgstr "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr "Lanier LD040"
 
-#: src/main/xmli18n-tmp.h:1021
-#, fuzzy
-msgid "Olympus P-S100"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
+msgstr "Lanier MP 4500"
 
-#: src/main/xmli18n-tmp.h:1022
-#, fuzzy
-msgid "Canon CP-10"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
+msgstr "Lanier LD345"
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
+msgstr "Lanier MP 5000B"
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
-msgstr "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
+msgstr "Lanier LD050B"
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
-msgstr "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
+msgstr "Lanier MP 5000"
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
-msgstr "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
+msgstr "Lanier LD050"
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
-msgstr "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
+msgstr "Lanier MP 5500"
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
+msgstr "Lanier LD255"
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
+msgstr "Lanier MP 6500"
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
+msgstr "Lanier LD265"
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
+msgstr "Lanier MP 7500"
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
+msgstr "Lanier LD275"
 
-#: src/main/xmli18n-tmp.h:1033
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
+msgstr "Lanier MP 9000"
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
+msgstr "Lanier LD190"
 
-#: src/main/xmli18n-tmp.h:1035
-#, fuzzy
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1037
-#, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:1038
-#, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
 
-#: src/main/xmli18n-tmp.h:1039
-#, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E321"
 
-#: src/main/xmli18n-tmp.h:1040
-#, fuzzy
-msgid "Sony DPP-EX5"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E323"
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:1043
-#, fuzzy
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:1047
-#, fuzzy
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
-msgstr "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
-msgstr "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
-msgstr "Curve type"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "Minimum X"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr "NRG 10515"
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
-msgstr "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr "NRG 10518"
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "Maximum X"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr "NRG 10512"
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
-msgstr "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
+msgstr "NRG 2205"
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
+msgstr "NRG 2238"
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
-msgstr "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr "NRG 2212"
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
+msgstr "NRG 2705"
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
-msgstr "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr "NRG 2738"
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr "NRG 2712"
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Inch"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr "NRG 3205"
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Set the base unit of measurement to inches"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr "NRG 3238"
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr "NRG 3212"
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Set the base unit of measurement to centimetres"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr "NRG 3525"
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
-msgstr "Points"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr "NRG 3508"
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Set the base unit of measurement to points (1/72\")"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
+msgstr "NRG 3502"
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "mm"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
+msgstr "NRG 3545"
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Set the base unit of measurement to millimetres"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
+msgstr "NRG 3518"
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "Pica"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
+msgstr "NRG 3532"
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Set the base unit of measurement to picas (1/12\")"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
+msgstr "NRG 4525"
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Colour output"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
+msgstr "NRG 4508"
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Print in shades of gray using black ink"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr "NRG 4502"
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "Standard Command"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
+msgstr "NRG 4545"
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
+msgstr "NRG 4518"
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "Custom Command"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
+msgstr "NRG 4532"
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
+msgstr "NRG 6002"
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "File"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr "NRG 6005"
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "Print to a file"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
+msgstr "NRG 6008"
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
-msgstr "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
+msgstr "NRG 7502"
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
-msgstr "Set Default"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr "NRG 7505"
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
-msgstr "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr "NRG 7508"
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr "NRG 9005"
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Cancel"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr "NRG 9008"
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Setup Printer..."
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr "NRG 9002"
 
-#: src/gutenprintui2/panel.c:1018
-#, fuzzy
-msgid "Reset"
-msgstr "Best"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
+msgstr "NRG DSm415"
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Print v%s"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
+msgstr "NRG DSm615"
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "About"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr "NRG DSm616"
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
-msgstr ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr "NRG DSm618"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
-msgstr ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr "NRG DSm618d"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Print"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr "NRG DSm620"
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Preview"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr "NRG DSm620d"
 
-#: src/gutenprintui2/panel.c:1448
-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 ""
-"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."
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr "NRG DSm622"
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "Paper Size"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr "NRG DSm627"
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr "NRG DSm632"
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Dimensions:"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr "NRG DSm635"
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Width:"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr "NRG DSm645"
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Width of the paper that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr "NRG DSm651"
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Height:"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr "NRG DSm660"
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Height of the paper that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr "NRG DSm675"
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
-msgstr "Automatic Paper Size"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr "NRG DSm725"
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
+msgstr "NRG DSm730"
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr "NRG DSm735"
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "Image Position"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr "NRG DSm745"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Auto"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr "NRG MP 1100"
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Portrait"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr "NRG MP 1350"
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Landscape"
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr "NRG MP 1600"
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Upside down"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr "NRG MP 161"
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Seascape"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
+msgstr "NRG MP 2000"
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr "NRG MP 2500"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientation:"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr "NRG MP 2510"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Left:"
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr "NRG MP 2550"
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Distance from the left of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
+msgstr "NRG MP 2550B"
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Right:"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr "NRG MP 3010"
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Distance from the left of the paper to the right of the image"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr "NRG MP 3350"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Distance from the right of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr "NRG MP 3350B"
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Top:"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr "NRG MP 3500"
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Distance from the top of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr "NRG MP 4000"
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Bottom:"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr "NRG MP 4000B"
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Distance from the top of the paper to bottom of the image"
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
+msgstr "NRG MP 4500"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Distance from the bottom of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr "NRG MP 5000"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centre:"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
+msgstr "NRG MP 5000B"
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "Horizontal"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr "NRG MP 5500"
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centre the image horizontally on the paper"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr "NRG MP 6500"
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Both"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr "NRG MP 7500"
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centre the image on the paper"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr "NRG MP 9000"
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "Vertical"
+#: src/xml/xmli18n-tmp.h:4929
+#, fuzzy
+msgid "Oki OL400"
+msgstr "Okidata OL400"
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centre the image vertically on the paper"
+#: src/xml/xmli18n-tmp.h:4930
+#, fuzzy
+msgid "Oki OL400e"
+msgstr "Okidata OL400e"
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Setup Printer"
+#: src/xml/xmli18n-tmp.h:4931
+#, fuzzy
+msgid "Oki OL400ex"
+msgstr "Okidata OL400ex"
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
-msgstr "Printer Make:"
+#: src/xml/xmli18n-tmp.h:4932
+#, fuzzy
+msgid "Oki OL410e"
+msgstr "Okidata OL410e"
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
-msgstr "Select the make of your printer"
+#: src/xml/xmli18n-tmp.h:4933
+#, fuzzy
+msgid "Oki OL600e"
+msgstr "Okidata OL600e"
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Printer Model:"
+#: src/xml/xmli18n-tmp.h:4934
+#, fuzzy
+msgid "Oki OL610e/S"
+msgstr "Okidata OL610e/S"
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Select your printer model"
+#: src/xml/xmli18n-tmp.h:4935
+#, fuzzy
+msgid "Oki OL800"
+msgstr "Okidata OL800"
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD File:"
+#: src/xml/xmli18n-tmp.h:4936
+#, fuzzy
+msgid "Oki OL810ex"
+msgstr "Okidata OL810ex"
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Enter the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4937
+#, fuzzy
+msgid "Oki Okipage 6e"
+msgstr "Okidata Okipage 6e"
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Browse"
+#: src/xml/xmli18n-tmp.h:4938
+#, fuzzy
+msgid "Oki Okipage 6ex"
+msgstr "Okidata Okipage 6ex"
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Choose the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4939
+#, fuzzy
+msgid "Oki Okipage 8p"
+msgstr "Okidata Okipage 8p"
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4940
+#, fuzzy
+msgid "Oki Okipage 10e"
+msgstr "Okidata Okipage 10e"
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "Printer Queue:"
+#: src/xml/xmli18n-tmp.h:4941
+#, fuzzy
+msgid "Oki Okipage 10ex"
+msgstr "Okidata Okipage 10ex"
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "Enter the correct command to print to your printer. "
+#: src/xml/xmli18n-tmp.h:4942
+#, fuzzy
+msgid "Oki Okipage 14ex"
+msgstr "Okidata Okipage 14ex"
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4943
+#, fuzzy
+msgid "Oki Super 6e"
+msgstr "Okidata Super 6e"
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
-msgstr "File to print to"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "Print To File"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Define New Printer"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Printer Name:"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Enter the name you wish to give this logical printer"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "About Gutenprint "
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Gutenprint Version "
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Printer Settings"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 1022"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Setup Printer..."
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 1027"
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 1032"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "New Printer..."
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 1035"
 
-#: src/gutenprintui2/panel.c:2093
-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 ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 1045"
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Set Defaults"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 1060"
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 1075"
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "Image Size"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 1515"
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Scaling:"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 2015"
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Set the scale (size) of the image"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 2016"
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Scale by:"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 2018"
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 2018D"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Percent"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 2020"
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Scale the print to the size of the page"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 2020D"
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 2022"
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Scale the print to the number of dots per inch"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 2027"
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Set the width of the print"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 2032"
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Set the height of the print"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 2035"
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 2035e"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Set the print size to the size of the image"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 2045"
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Print Colour Adjust"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 2045e"
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Set Defaults"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 2051"
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Close"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 2060"
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Image preview"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 2075"
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
-msgstr "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 2090"
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
-msgstr "Output"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 2105"
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Output Type:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Select the desired output type"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 3025"
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Adjust Output..."
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 3030"
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr ""
-"Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 3035"
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "Size Units:"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 3045"
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
-msgstr " "
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Units:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Select the base unit of measurement for printing"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio MP 1100"
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio MP 1350"
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio MP 1600"
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio MP 161"
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio MP 2000"
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio MP 2500"
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio MP 2510"
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio MP 2550"
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "Printer"
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio MP 2550B"
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(Default Printer)"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio MP 3010"
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "Printer Features"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio MP 3350"
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
-msgstr "Output Control"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio MP 3350B"
 
-#: src/cups/genppd.c:151
-msgid "Common"
-msgstr "Common"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio MP 3500"
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
-msgstr "Extra 1"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio MP 4000"
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
-msgstr "Extra 2"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio MP 4000B"
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
-msgstr "Extra 3"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio MP 4500"
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
-msgstr "Extra 4"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio MP 5000"
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
-msgstr "Extra 5"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio MP 5000B"
 
-#. 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:1064
-msgid "English"
-msgstr "English-GB"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio MP 5500"
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "UTF-8"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio MP 6500"
 
-#: src/cups/genppd.c:1647
-#, fuzzy
-msgid "2-Sided Printing"
-msgstr "Double-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio MP 7500"
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio MP 9000"
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-1250"
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-1450"
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "No"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-1450PS"
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "Yes"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-1650"
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-#, fuzzy
-msgid "Value"
-msgstr "Blue"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-1651N"
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
-msgstr "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-1750"
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil version "
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-2150"
 
-#: 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-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 Licence as published by the Free\n"
-"Software Foundation; either version 2 of the Licence, 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 Licence\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public Licence\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/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-2150PS"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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 ""
-"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 ® printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\n"
-"  Commands:\n"
-"    -c|--clean-head    Clean the print head.\n"
-"    -n|--nozzle-check  Print a nozzle test pattern.\n"
-"                       Dirty or clogged nozzles will show as gaps in the\n"
-"                       pattern.  If you see any gaps, you should clean\n"
-"                       the print head.\n"
-"    -a|--align-head    Align the print head.  CAUTION: Misuse of this\n"
-"                       utility may result in poor print quality and/or\n"
-"                       damage to the printer.\n"
-"    -s|--status        Retrieve printer status.\n"
-"    -i|--ink-level     Obtain the ink level from the printer.  This "
-"requires\n"
-"                       read/write access to the raw printer device.\n"
-"    -e|--extended-ink-info     Obtain the extended ink information from the\n"
-"                       printer.  This requires read/write access to the raw\n"
-"                       printer device.\n"
-"    -d|--identify      Query the printer for make and model information.\n"
-"                       This requires read/write access to the raw printer\n"
-"                       device.\n"
-"    -l|--license       Display the license/warranty terms of this program.\n"
-"    -M|--list-models   List the available printer models.\n"
-"    -h|--help          Print this help message.\n"
-"  Options:\n"
-"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
-"                       Default is the default system printer.\n"
-"    -r|--raw-device    Specify the name of the device to write to directly\n"
-"                       rather than going through a printer queue.\n"
-"    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).  Only needed when not using a raw device.\n"
-"    -q|--quiet         Suppress the banner.\n"
-"    -S|--short-name    Print the short name of the printer with --identify.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
-"    -C|--choices       Specify the number of pattern choices for alignment\n"
-"    -p|--patterns      Specify the number of sets of patterns for alignment\n"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-2151N"
 
-#: 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 ""
-"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 ® 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"
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-2151NPS"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "You may only specify one printer or raw device."
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-2152W"
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "You may only specify one printer model."
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-2152WPS"
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
-msgstr "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-2250"
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
-msgstr "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-2550"
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Unknown option %c\n"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-2551N"
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-2552W"
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
-msgstr "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
-msgstr "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Cannot open device %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Cannot print to printer %s with %s\n"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Unable to send command to printer\n"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
-msgstr "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Cannot read from %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Cannot open %s read/write: %s\n"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7300"
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Unknown option %c\n"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7300N"
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
-msgstr ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
-msgstr ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr "Savin 2522"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "Unknown"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr "Savin 2527"
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
-msgstr "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr "Savin 2532"
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
-msgstr "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
+msgstr "Savin 2535"
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
-msgstr "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr "Savin 2235"
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
-msgstr "Status: Waiting\n"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr "Savin 2545"
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
-msgstr "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr "Savin 2245"
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
+msgstr "Savin 2560"
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
-msgstr "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
+msgstr "Savin 2575"
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
-msgstr "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
+msgstr "Savin 3515"
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
+msgstr "Savin 40105"
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
-msgstr "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
+msgstr "Savin 4015"
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
-msgstr "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
+msgstr "Savin 4018"
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
-msgstr "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr "Savin 4018d"
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
-msgstr "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr "Savin 4022"
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
-msgstr "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr "Savin 4027"
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
-msgstr "Error: Ink out\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
+msgstr "Savin 4035"
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
-msgstr "Error: Paper out\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr "Savin 4135g"
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
-msgstr "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr "Savin 4035e"
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
-msgstr "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr "Savin 4135eG"
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
-msgstr "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr "Savin 4045"
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
-msgstr "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr "Savin 4145g"
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
-msgstr "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr "Savin 4045e"
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
-msgstr "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr "Savin 4145eG"
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
-msgstr "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr "Savin 4051"
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
-msgstr "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
+msgstr "Savin 4060"
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
-msgstr "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr "Savin 4075"
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
-msgstr "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr "Savin 4090"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Ink colour"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr "Savin 7025"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Percent remaining"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr "Savin 8016"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
-msgstr "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
+msgstr "Savin 8020"
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
-msgstr "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr "Savin 8020d"
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
-msgstr "Job Name: "
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr "Savin 8025"
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
-msgstr "ink levels"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr "Savin 8025e"
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "status"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr "Savin 8030"
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Obtaining %s requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr "Savin 8030e"
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Obtaining extended ink information requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
+msgstr "Savin 8035"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
+msgstr "Savin 8035g"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
-msgstr "Part number"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
+msgstr "Savin 8035e"
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "Date"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
+msgstr "Savin 8045"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Printer identification requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
+msgstr "Savin 8045g"
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Cannot identify printer model.\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
+msgstr "Savin 8045e"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Cleaning heads...\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr "Savin 8055"
 
-#: src/escputil/escputil.c:1728
-#, 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/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
+msgstr "Savin 8065"
 
-#: src/escputil/escputil.c:1732
-#, 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 ""
-"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"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
+msgstr "Savin 8075"
 
-#: src/escputil/escputil.c:1767
-#, 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 ""
-"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"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
+msgstr "Savin 8090"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Unable to send command to the printer, exiting.\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
+msgstr "Savin 8110"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
-msgstr "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
+msgstr "Savin 8135"
 
-#: src/escputil/escputil.c:1828
-#, 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 ""
-"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"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
+msgstr "Savin 816"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
+msgstr "Savin 9016"
 
-#: src/escputil/escputil.c:1843
-#, 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/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
+msgstr "Savin 9021d"
 
-#: src/escputil/escputil.c:1850
-#, 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 ""
-"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/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
+msgstr "Savin 9025"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
+msgstr "Savin 9025b"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Repeating the alignment process.\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr "Savin 9033"
 
-#: src/escputil/escputil.c:1871
-#, 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 ""
-"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"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr "Savin 9033b"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "About to save settings..."
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
+msgstr "Savin 9040"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "failed!\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
+msgstr "Savin 9040b"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
-msgstr ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
+msgstr "Savin 9050"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "succeeded!\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr "Savin 9050b"
 
-#: src/escputil/escputil.c:1895
-#, 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/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Unrecognised command.\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Final command was not confirmed.\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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 ""
-"This procedure assumes that your printer is an Epson %s.\n"
-"If this is not your printer model, please type control-C now and\n"
-"choose your actual printer model.\n"
-"\n"
-"Please place a sheet of paper in your printer to begin the head\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Press enter to continue > "
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr "Star LS-04"
 
-#: src/escputil/escputil.c:1984
-#, 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 ""
-"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"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Pass #%d"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
+msgstr "Tally MT908"
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Please insert a fresh sheet of paper.\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Number out of range!\n"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "I cannot understand what you typed!\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "The best pair of lines should be numbered between 1 and %d.\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Attempting to set alignment..."
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "succeeded.\n"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
 
-#: src/escputil/escputil.c:2046
-#, 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 ""
-"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"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Error in input\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Printing..."
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
 
-#~ msgid ""
-#~ "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
-#~ "  does not match the PPD file (%s).  If you have upgraded your version\n"
-#~ "  of Gutenprint recently, you must reinstall all printer queues.\n"
-#~ "  Please refer to your vendor's documentation or the ``foomatic-"
-#~ "ppdfile''\n"
-#~ "  command for instructions.\n"
-#~ "ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) "
-#~ "does not match the PPD file (%s).\n"
-#~ msgstr ""
-#~ "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
-#~ "  does not match the PPD file (%s).  If you have upgraded your version\n"
-#~ "  of Gutenprint recently, you must reinstall all printer queues.\n"
-#~ "  Please refer to your vendor's documentation or the ``foomatic-"
-#~ "ppdfile''\n"
-#~ "  command for instructions.\n"
-#~ "ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) "
-#~ "does not match the PPD file (%s).\n"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
 
-#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-#~ msgstr ""
-#~ "ERROR: ijsgutenprint: Bad colour space: bps %d channels %d space %s\n"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
 
-#~ msgid "ERROR: ijsgutenprint: No row buffer\n"
-#~ msgstr "ERROR: ijsgutenprint: No row buffer\n"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
 
-#~ msgid ""
-#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-#~ msgstr ""
-#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-#~ msgstr ""
-#~ "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-#~ msgstr "ERROR: ijsgutenprint: Printer %s is not a known model\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#~ msgid "ijsgutenprint: unknown DeviceModel %s\n"
-#~ msgstr "ijsgutenprint: unknown DeviceModel %s\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse curve %s\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse %s float %s\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse %s int %s\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-#~ msgstr "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-#~ msgstr "ERROR: ijsgutenprint: Bad parameter %s %d\n"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
 
-#~ msgid "ERROR: ijsgutenprint: bad key code %d\n"
-#~ msgstr "ERROR: ijsgutenprint: bad key code %d\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
 
-#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-#~ msgstr "ERROR: ijsgutenprint: image_init failed %d\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
 
-#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
 
-#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Unable to open %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
 
-#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-#~ msgstr "ERROR: ijsgutenprint: Unknown printer %s\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
 
-#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-#~ msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
 
-#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-#~ msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
 
-#, fuzzy
-#~ msgid "Canon MULTIPASS MP500"
-#~ msgstr "Canon S500"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
 
-#, fuzzy
-#~ msgid "Canon MULTIPASS MP760"
-#~ msgstr "Canon LBP-1760"
-
-#~ msgid "Cassette"
-#~ msgstr "Cassette"
-
-#~ msgid "CD tray"
-#~ msgstr "CD tray"
-
-#~ msgid " Gamma"
-#~ msgstr " Gamma"
-
-#~ msgid " Curve"
-#~ msgstr " Curve"
-
-#~ msgid "1440 x 1440"
-#~ msgstr "1440 × 1440"
-
-#~ msgid "1440 x 1440 DPI High Quality"
-#~ msgstr "1440 × 1440 DPI High Quality"
-
-#~ msgid "1440 x 1440 DPI Highest Quality"
-#~ msgstr "1440 × 1440 DPI Highest Quality"
-
-#~ msgid "2880 x 1440 DPI High Quality"
-#~ msgstr "2880 × 1440 DPI High Quality"
-
-#~ msgid "2880 x 1440 DPI Highest Quality"
-#~ msgstr "2880 × 1440 DPI Highest Quality"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-#~ "and the rest of the Gutenprint Development Team.\n"
-#~ "\n"
-#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-#~ "USA\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-#~ "and the rest of the Gutenprint Development Team.\n"
-#~ "\n"
-#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
-#~ "\n"
-#~ "This program is free software; you can redistribute it and/or modify\n"
-#~ "it under the terms of the GNU General Public License as published by\n"
-#~ "the Free Software Foundation; either version 2 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program; if not, write to the Free Software\n"
-#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-#~ "USA\n"
-
-#~ msgid ""
-#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
-#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
-#~ "l'\n"
-#~ "This is free software, and you are welcome to redistribute it\n"
-#~ "under certain conditions; type 'escputil -l' for details.\n"
-#~ msgstr ""
-#~ ", Copyright © 2000-2006 Robert Krawitz\n"
-#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
-#~ "l'\n"
-#~ "This is free software, and you are welcome to redistribute it\n"
-#~ "under certain conditions; type 'escputil -l' for details.\n"
-
-#~ msgid "90x90 DPI"
-#~ msgstr "90×90 DPI"
-
-#~ msgid "90x90 DPI DMT"
-#~ msgstr "90×90 DPI DMT"
-
-#~ msgid "180x180 DPI"
-#~ msgstr "180×180 DPI"
-
-#~ msgid "180x180 DPI DMT"
-#~ msgstr "180×180 DPI DMT"
-
-#~ msgid "360x360 DPI"
-#~ msgstr "360×360 DPI"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
 
-#~ msgid "360x360 DPI DMT"
-#~ msgstr "360×360 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
 
-#~ msgid "720x360 DPI"
-#~ msgstr "720×360 DPI"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
 
-#~ msgid "720x360 DPI DMT"
-#~ msgstr "720×360 DPI DMT"
-
-#~ msgid "720x720 DPI"
-#~ msgstr "720×720 DPI"
-
-#~ msgid "720x720 DPI DMT"
-#~ msgstr "720×720 DPI DMT"
-
-#~ msgid "1440x720 DPI"
-#~ msgstr "1440×720 DPI"
-
-#~ msgid "1440x720 DPI DMT"
-#~ msgstr "1440×720 DPI DMT"
-
-#~ msgid "1440x1440 DPI"
-#~ msgstr "1440×1440 DPI DMT"
-
-#~ msgid "1440x1440 DPI DMT"
-#~ msgstr "1440×1440 DPI DMT"
-
-#~ msgid "2880x2880 DPI"
-#~ msgstr "2880×2880 DPI"
-
-#~ msgid "2880x2880 DPI DMT"
-#~ msgstr "2880×2880 DPI DMT"
-
-#~ msgid "150x150 DPI DMT"
-#~ msgstr "150×150 DPI DMT"
-
-#~ msgid "300x300 DPI DMT"
-#~ msgstr "300×300 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
 
-#~ msgid "600x300 DPI DMT"
-#~ msgstr "600×300 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
 
-#~ msgid "600x600 DPI DMT"
-#~ msgstr "600×600 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
 
-#~ msgid "1200x600 DPI DMT"
-#~ msgstr "1200×600 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-720"
 
-#~ msgid "1200x1200 DPI"
-#~ msgstr "1200×1200 DPI"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-730"
 
-#~ msgid "1200x1200 DPI DMT"
-#~ msgstr "1200×1200 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-740"
 
-#~ msgid "2400x2400 DPI"
-#~ msgstr "2400×2400 DPI"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-750"
 
-#~ msgid "2400x2400 DPI DMT"
-#~ msgstr "2400×2400 DPI DMT"
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY ES1"
 
-#~ msgid "Plain Paper PIXMA"
-#~ msgstr "Plain Paper PIXMA"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY ES2"
 
-#~ msgid "Back Print Film"
-#~ msgstr "Back Print Film"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY ES20"
 
-#~ msgid "Fabric Sheets"
-#~ msgstr "Fabric Sheets"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
 
-#~ msgid "Envelope"
-#~ msgstr "Envelope"
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
 
-#~ msgid "High Resolution Paper"
-#~ msgstr "High Resolution Paper"
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#~ msgid "T-Shirt Transfers"
-#~ msgstr "T-Shirt Transfers"
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
 
-#~ msgid "High Gloss Film"
-#~ msgstr "High Gloss Film"
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Glossy Photo Paper"
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#~ msgid "Glossy Photo Cards"
-#~ msgstr "Glossy Photo Cards"
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#~ msgid "Photo Paper Pro"
-#~ msgstr "Photo Paper Pro"
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
 
-#~ msgid "Photo CcMmYK Color"
-#~ msgstr "Photo CcMmYK Colour"
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare-Printer-Dock"
 
-#~ msgid "Photo CcMmY Color"
-#~ msgstr "Photo CcMmY Colour"
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
 
-#~ msgid "CMYK Color"
-#~ msgstr "CMYK Colour"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr "RAW DATA 16 bit"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY Colour"
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr "RAW DATA 8 bit"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/File/Print..."
+#~ msgid "ISOLatin1"
+#~ msgstr "UTF-8"
diff --git a/po/es.gmo b/po/es.gmo
index 772dda0..7ba9141 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 5eecacb..4cd115d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2002-04-29 00:38GMT\n"
 "Last-Translator: Gustavo D. Vranjes <gvranjes@abaconet.com.ar>\n"
 "Language-Team: Castellano <es@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Establecer por Omisión"
@@ -97,18 +97,19 @@ msgstr ""
 msgid "Density"
 msgstr "Densidad:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -167,9 +168,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamaño"
@@ -178,320 +179,367 @@ msgstr "Tamaño"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Configuración de la Impresora"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamaño del papel al que desea imprimir"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Tipo de Medio"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Fuente de Medio"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, 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:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Resolución"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta de la impresora"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 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:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+#, fuzzy
+msgid "Print Quality"
+msgstr "720 PPP Altísima Calidad"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Blanco y Negro"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Tipo de salida:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Estándar"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -526,9 +574,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Tonos de gris"
 
@@ -545,11 +592,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -615,7 +662,7 @@ msgid "Output image type"
 msgstr "Tipo de salida:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -684,16 +731,56 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cian"
 
@@ -702,16 +789,56 @@ msgstr "Cian"
 msgid "Adjust the cyan gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -720,16 +847,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Amarillo"
 
@@ -738,9 +905,11 @@ msgstr "Amarillo"
 msgid "Adjust the yellow gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -749,7 +918,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -758,9 +927,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -770,16 +940,54 @@ msgid "Adjust the blue gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Negro"
 
@@ -788,7 +996,7 @@ msgstr "Negro"
 msgid "Adjust the black gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -803,7 +1011,7 @@ msgstr "Tonos de gris"
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -813,7 +1021,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajusta el balance amarillo de la impresión"
@@ -845,10 +1053,11 @@ msgstr "Tipo de Tinta"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de salida:"
@@ -857,27 +1066,27 @@ msgstr "Tipo de salida:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1023,505 +1232,570 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s no es un parámetreo válido del tipo %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impresora desconocida %s\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s fuera de rango (valor %d, mín %d, máx %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "La medida de la imagen no es válida\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "El margen superior no debe ser menos que cero\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "El margen izquierdo no debe ser menos que cero\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "El margen izquierdo no debe ser menos que cero\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "El margen superior no debe ser menos que cero\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
-msgid "Print Quality"
-msgstr "720 PPP Altísima Calidad"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Comando no reconocido.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cian"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Blanco y Negro"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Cian"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Ajusta el balance amarillo de la impresión"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Densidad:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Ajusta el balance amarillo de la impresión"
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Película Brillante"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Tonos de gris"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Tonos de gris"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Tonos de gris"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Tipo de salida:"
+msgid "Paper Thickness"
+msgstr "Tamaño"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Establecer por Omisión"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Densidad:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Modelo de Impresora:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Papel Común"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Estándar"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1574,129 +1848,356 @@ msgid "test print"
 msgstr "prueba de impresión"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Cuatro Colores Estándard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Tres Colores Compuestos"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Fotografía de Seis Colores"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Papel Común"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Película Brillante"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Transparencias"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Sobres"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Otro"
 
@@ -1712,178 +2213,203 @@ msgstr "Manual con Pausa"
 msgid "Manual without Pause"
 msgstr "Manual sin Pausa"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "Película Brillante"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Opaco"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Blanco y Negro"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Común"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 #, fuzzy
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Fotografía Brillante"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Fotografía de Secado Rápido"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Transparencia de Secado Rápido"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manual"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Bandeja 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Bandeja 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Bandeja 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Bandeja 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Alimentador Portable de Hojas"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Alimentador de Hojas de Escritorio"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Bandeja"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Fuente Opcional"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 PPP"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 PPP"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 PPP"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 PPP monocromo"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 PPP"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 PPP"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 PPP"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Altura:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografía"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Negro + Color"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Cartuchos Color + Fotografía"
 
@@ -1892,6723 +2418,10215 @@ msgstr "Cartuchos Color + Fotografía"
 msgid "PPDFile"
 msgstr "Archivo PPD:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "¿Archivo PPD?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Cancelar"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Carta"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Personalizado"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
 #, fuzzy
-msgid "Two Level Grayscale"
-msgstr "Tonos de gris"
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Tonos de gris"
+msgid "Ultra Photo"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr ""
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:49
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Fotografía de Seis Colores"
+msgid "Photograph"
+msgstr "Fotografía"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Seis Colores Compuestos Mejorados"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Arte lineal"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
+#: src/main/generic-options.c:55
 #, fuzzy
-msgid "Seven Color Photo"
-msgstr "Fotografía de Seis Colores"
+msgid "Page"
+msgstr "Tamaño"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Siete Colores Mejorados"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Fotografía de Seis Colores"
+msgid "Image Type"
+msgstr "Tipo de Imagen :"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#: src/main/generic-options.c:69
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgid "Type of image being printed"
+msgstr "Tipo de tinta de la impresora"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1914
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Siete Colores Mejorados"
+msgid "Page Number"
+msgstr "Tamaño"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "Cuatro Colores Estándard"
+msgid "Page number"
+msgstr "Tamaño"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/gutenprintui2/curve.c:130
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Tres Colores Compuestos"
+msgid "Curve type"
+msgstr "Negro"
+
+#: 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/main/escp2-channels.c:1981
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Pulgada"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Seleccionar la unidad base de medida a pulgadas"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Tres Colores Compuestos"
+msgid "Points"
+msgstr "Imprimir"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Cuatro Colores Estándard"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Seleccionar la unidad base de medida a pulgadas"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "Cuatro Colores Estándard"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Salida de color"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Imprimir en sombras de gris usando tinta negra"
+
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgid "Standard Command"
+msgstr "Estándar"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Seis Colores Compuestos Mejorados"
+msgid "Custom Command"
+msgstr "Comando:"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr ""
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Archivo"
+
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgid "Print to a file"
+msgstr "¿Imprimir a un archivo?"
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr ""
+
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Siete Colores Mejorados"
+msgid "Set Default"
+msgstr "Establecer por Omisión"
+
+#: 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 "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/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:642
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgid "Select File..."
+msgstr "Conf. Impresora..."
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: 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 "Acerca de"
+
+#: src/gutenprintui2/panel.c:1394
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Fotografía de Seis Colores"
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr "Configuración de la Impresora"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:1396
+#, fuzzy
+msgid ""
+"Save\n"
+"Settings"
+msgstr "Guardar Conf."
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Imprimir"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: src/gutenprintui2/panel.c:1475
+#, fuzzy
+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 la imagen en la hoja.\n"
+"Seleccione y arrastre con el primer botón para posicionar la imagen.\n"
+"Seleccione y arrastre con el segundo botón para mover la imagen con\n"
+"mayor precisión; cada unidad de movimiento mueve la imagen un punto\n"
+"(1/72\")\n"
+"Seleccione y arrastre con el tercer botón (el medio) para mover la\n"
+"imagen en unidades del tamaño de la imagen.\n"
+"Sosteniendo la tecla 'shift' mientras se hace click y arrastra restringe\n"
+"el movimiento de la imagen a los ejes vertical y horizontal solamente.\n"
+"Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n"
+"posición original\n"
+
+#: src/gutenprintui2/panel.c:1522
+#, fuzzy
+msgid "Paper Size"
+msgstr "Tamaño"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Dimensiones:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Ancho:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Ancho del papel al que desea 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 del papel al que desea imprimir"
+
+#: src/gutenprintui2/panel.c:1577
+#, fuzzy
+msgid "Automatic Paper Size"
+msgstr "Tamaño"
+
+#: 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
+#, fuzzy
+msgid "Image Position"
+msgstr "Posición"
+
+#: 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 "Invertido"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Horizontal invertido"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
+"invertido "
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientación:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Izquierda:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Distancia desde el borde izquierdo del papel al borde de la imagen"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Derecha:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr ""
+"Distancia desde el borde izquierdo del papel al borde derecho de la imagen"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Distancia desde el borde derecho del papel al borde de la imagen"
+
+#: src/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 el borde superior del papel al borde de la imagen"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Abajo:"
+
+#: src/gutenprintui2/panel.c:1696
+#, fuzzy
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr ""
+"Distancia desde el borde superior del papel al borde inferior de la imagen"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Distancia desde el borde inferior del papel al borde de la imagen"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centrado: "
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centrar la imagen horizontalmente en el papel"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Ambos"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centrar la imagen en el papel"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "Vertical"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centrar la imagen verticalmente en el papel"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Configuración de la Impresora"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "Nombre de la Impresora:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "Seleccionar su madelo de impresora"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Modelo de Impresora:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Seleccionar su madelo de impresora"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "Archivo PPD:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Explorar"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Elija el nombre de archivo PPD correcto para su impresora"
+
+#: 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 ""
+"Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
+"que desea imprimir"
+
+#: src/gutenprintui2/panel.c:1914
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "Nombre de la Impresora:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "prueba de impresión"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "¿Imprimir a un archivo?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definir Nueva Impresora"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Nombre de la Impresora:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Ingrese el nombre que desea dar a ésta impresora lógica"
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "Acerca de Gimp-Print..."
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Versión de Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Configuración de la 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 ""
+"Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
+"que desea imprimir"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Conf. Impresora..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
+"imprimir a ésta impresora"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Impresora Nueva..."
+
+#: 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 ""
+"Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una "
+"colección de configuraciones que usted desea recordar para uso futuro."
+
+#: src/gutenprintui2/panel.c:2150
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Establecer por Omisión"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Tamaño"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Escala:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Establecer la escala (el tamaño) de la imagen"
+
+#: 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 ""
+"Seleccionar si la escala se mide como porcentaje de la medida del papel "
+"disponible o número de puntos por pulgada en la salida."
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Porcentaje"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Redimensionar la impresión al tamaño de la página"
+
+#: 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 "Redimensionar la impresión al tamaño de los puntos por pulgada"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Establecer el ancho de la impresión"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Establecer el alto de la impresión"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Usar Medida Orig.\n"
+"de la Imagen"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Establecer la medida de impresión a la medida de la imagen"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Ajuste de Impresión en Color"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Establecer por Omisión"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Vista previa de imagen"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Tipo de salida:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Tipo de salida:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Seleccionar el tipo de salida deseado"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Ajustar Salida..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Ajustar balance de color, brillo, contraste, saturacion, y algoritmo de "
+"entramado"
+
+#: src/gutenprintui2/panel.c:2523
+#, fuzzy
+msgid "Size Units:"
+msgstr "Unidades:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+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 la unidad base de medida para imprimir"
+
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Imprimir"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Configuración de la Impresora"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Configuración de la Impresora"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Tipo de salida:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Comando:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "Bandeja 1"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "Bandeja 2"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "Bandeja 3"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "Bandeja 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Spanish"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Tamaño del medio:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Color"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Tonos de gris"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Color"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "Color CMY (Cian/Mag/Amar)"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr ""
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n"
+"bajo los términos de la Licencia General Pública GNU tal como se la publica\n"
+"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n"
+"opción) cualquier versión posterior.\n"
+"\n"
+"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n"
+"GARANTÍA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n"
+"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más "
+"detalles.\n"
+"\n"
+"Usted debe haber recibido una copia de la Licencia General Pública GNU\n"
+"junto con éste programa; si no, escriba a la Fundación de Software\n"
+"Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-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 | -o | -s | -d | -l | -M]\n"
+"                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo]\n"
+"Realiza mantenimiento en impresoras EPSON Stylus (R).\n"
+"Ejemplos: escputil --clean-head --printer stpex-on-third-floor\n"
+"          escputil --ink-level --new --raw-device /dev/lp0\n"
+"\n"
+"  Comandos:\n"
+"    -c|--clean-head    Limpia el cabezal de impresión\n"
+"    -n|--nozzle-check  Imprime un patrón de prueba de toberas.\n"
+"                        Toberas sucias o tapadas se mostrarán como vacíos "
+"en\n"
+"                        el patrón. Si usted ve algún vacío, deberá limpiar\n"
+"                        el cabezal de impresión.\n"
+"    -a|--align-head    Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
+"                        de ésta utilidad puede resultar en una calidad "
+"pobre\n"
+"                        de impresión y/o daño a la impresora.\n"
+"    -o|--align-color   Alinear el cabezal de impresión color (Stylus Color\n"
+"                        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
+"         \t\tutilidad puede resultar en una calidad pobre de\n"
+"\t        \timpresión y/o daño a la impresora.\n"
+"    -s|--status        Recoger el status de la impresora.\n"
+"    -i|--ink-level     Obtener el nivel de tinta de la impresora. Ésto\n"
+"                        requiere acceso de lectura/escritura al dispositivo\n"
+"\t\t        crudo de impresión.\n"
+"    -d|--identify      Consultar la impresora por información de marca y\n"
+"                        modelo. Ésto requiere acceso de lectura/escritura "
+"al\n"
+"\t\t\tdispositivo crudo de impresión.\n"
+"    -l|--license       Mostrar los términos de la licencia/garantía de éste\n"
+"         \t\tprograma\n"
+"    -M|--list-models   Listar los modelos de impresora disponibles.\n"
+"    -h|--help          Imprimir éste mensaje de ayuda.\n"
+"  Opciones:\n"
+"    -P|--printer-name  Especifica el nombre de la cola de impresión en la\n"
+"\t\t\tque se opera. Por defecto es la impresora del\n"
+"\t\t\tsistema.\n"
+"    -r|--raw-device    Especifica el nombre del dispositivo a escribir\n"
+"\t\t\tdirectamente en vez de mandarlo a través de la cola\n"
+"                        de impresión.\n"
+"    -u|--new           La impresora es de nuevo modelo (Stylus Color 740 o\n"
+"                        más nueva).\n"
+"    -q|--quiet         Suprimir carteles.\n"
+"    -m|--model         Especificar el modelo preciso de impresora para\n"
+"\t\t\talineación de cabezal.\n"
+
+#: src/escputil/escputil.c:162
+#, fuzzy
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\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 [OPCIONES] [COMANDO]\n"
+"Uso: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo]\n"
+"Realiza mantenimiento en impresoras EPSON Stylus (R).\n"
+"Ejemplos: escputil -c -P stpex-on-third-floor\n"
+"          escputil -i -u -r /dev/lp0\n"
+"\n"
+"  Comandos:\n"
+"    -c Limpia el cabezal de impresión.\n"
+"    -n Imprime un patrón de prueba de toberas.\n"
+"        Toberas sucias o tapadas se mostrarán como vacíos en\n"
+"        el patrón. Si usted ve algún vacío, deberá limpiar\n"
+"        el cabezal de impresión.\n"
+"    -a Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
+"        de ésta utilidad puede resultar en una calidad pobre\n"
+"        de impresión y/o daño a la impresora.\n"
+"    -o Alinear el cabezal de impresión color (Stylus Color\n"
+"        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
+"        utilidad puede resultar en una calidad pobre de\n"
+"\t impresión y/o daño a la impresora.\n"
+"    -s Recoger el status de la impresora.\n"
+"    -i Obtener el nivel de tinta de la impresora. Ésto\n"
+"        requiere acceso de lectura/escritura al dispositivo\n"
+"\t crudo de impresión.\n"
+"    -d Consultar la impresora por información de marca y\n"
+"        modelo. Ésto requiere acceso de lectura/escritura al\n"
+"\t dispositivo crudo de impresión.\n"
+"    -l Mostrar los términos de la licencia/garantía de éste\n"
+"        programa\n"
+"    -M Listar los modelos de impresora disponibles.\n"
+"    -h Imprimir éste mensaje de ayuda.\n"
+"  Opciones:\n"
+"    -P Especifica el nombre de la cola de impresión en la\n"
+"\t que se opera. Por defecto es la impresora del\n"
+"\t sistema.\n"
+"    -r Especifica el nombre del dispositivo a escribir\n"
+"\t directamente en vez de mandarlo a través de la cola\n"
+"        de impresión.\n"
+"    -u La impresora es de nuevo modelo (Stylus Color 740 o\n"
+"        más nueva).\n"
+"    -q Suprimir carteles.\n"
+"    -m Especificar el modelo preciso de impresora para\n"
+"\t alineación de cabezal.\n"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Usted sólo puede especificar un modelo de impresora"
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Opción desconocida %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "No puedo abrir dispositivo %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "No puedo imprimir a impresora %s con %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "No puedo enviar comando a impresora\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "No puedo leer %s de: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "No puedo abrir %s  para lectura/escritura: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Opción desconocida %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "No puedo escribir a %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"No puedo escribir a %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"No puedo detectar el tipo de impresora.\n"
+"Favor de usar -m para especificar su modelo de impresora.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel para Fotografía"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "Papel Opaco"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cian Claro"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "Amarillo"
+msgid "Matte Black"
+msgstr "Papel Opaco"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Negro"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Papel Común Carga Rápida"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Tamaño"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Saturación:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Error en entrada\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Error en entrada\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Error en entrada\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Color de tinta"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Porcentaje restante"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Nombre de la Impresora:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Usted sólo puede especificar un modelo de impresora"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Limpiando inyectores...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
+"\n"
+"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
+"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
+"una degradación de la calidad de impresión y posiblemente daño a su "
+"impresora.\n"
+"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
+"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
+"utilidad corre por la exclusiva cuenta del usuario.\n"
+"\n"
+"Ésta utilidad imprime %d patrones de prueba. Cada patrón tiene aspecto muy\n"
+"similar. Los patrones consisten en una serie de pares de líneas verticales\n"
+"que se solapan. Debajo de cada par de líneas hay un número entre %d y %d.\n"
+"\n"
+"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
+"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
+"Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n"
+"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
+"más crítica.\n"
+"También se sugiere que use un papel de buena calidad para las pruebas,\n"
+"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
+"papel.\n"
+"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
+"de nuevo el papel en la impresora antes de volver a usarla.\n"
+"\n"
+"Cada patrón es similar, pero los últimos patrones usan puntos más finos\n"
+"para una alineación más crítica. Usted debe hacer todas las pasadas para\n"
+"alinear correctamente su impresora. Después de ejecutar todas las pasadas\n"
+"de alineación, los patrones de alineación se imprimirán una vez más. Debe\n"
+"observarse que el par medio entre todos (#%d de %d) es el mejor de todos\n"
+"los patrones.\n"
+"\n"
+"Después que los patrones sean impresos una vez más, le será ofrecida la\n"
+"elección de guardar (s) el resultado en la impresora, repetir el proceso\n"
+"(r), o salir sin guardar (q). Salir sin guardar no restaurará la\n"
+"configuración previa, pero apagar y volver a encender la impresora lo hará.\n"
+"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
+"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
+"durante éste proceso.\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
+"\n"
+"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
+"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
+"una degradación de la calidad de impresión y posiblemente daño a su "
+"impresora.\n"
+"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
+"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
+"utilidad corre por la exclusiva cuenta del usuario.\n"
+"\n"
+"Ésta utilidad imprime un patrón de prueba que consiste en una serie de "
+"pares\n"
+"de líneas verticales que se solapan. Debajo de cada par de líneas hay un\n"
+"número entre %d y %d.\n"
+"\n"
+"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
+"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
+"Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n"
+"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
+"más crítica.\n"
+"También se sugiere que use un papel de buena calidad para la prueba,\n"
+"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
+"papel.\n"
+"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
+"de nuevo el papel en la impresora antes de volver a usarla.\n"
+"\n"
+"Después de ejecutar el patrón de alineación, éste se imprimirá una vez más.\n"
+"Debe observarse que el par medio entre todos (#%d de %d) es el mejor.\n"
+"Entonces le será ofrecida la elección de guardar (s) el resultado en la\n"
+"impresora, repetir el proceso (r), o salir sin guardar (q). Salir sin\n"
+"guardar no restaurará la configuración previa, pero apagar y volver a\n"
+"encender la impresora lo hará.\n"
+"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
+"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
+"durante éste proceso.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Favor de inspeccionar la salida final muy cuidadosamente para asegurar que\n"
+"su impresora se encuentre alineada. Usted puede ahora:\n"
+"  (s) Guardar los resultados en la impresora,\n"
+"  (q) Salir sin guardar los resultados, o\n"
+"  (r) Repetir el proceso completamente desde el principio.\n"
+"Luego le será requerido confirmar su elección.\n"
+"¿Qué opción elige? (s), (q), (r).\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+"Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
+"guardar:\n"
+
+#: src/escputil/escputil.c:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
+"proceso de alineado:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Repitiendo el proceso de alineación.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Ésto alterará permanentemente la configuración de su impresora.\n"
+"ADVERTENCIA: éste procedimiento no está aprobado por Seiko Epson, y\n"
+"puede dañar su impresora. ¿Proceder?\n"
+"Favor de confirmar que desea guardar la configuración de su impresora\n"
+"tipeando 's' de nuevo.\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Acerca de guardar configuración..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "¡falló!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Su configuración no fue guardada exitosamente. Debe repetir el\n"
+"proceso de alineación.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "¡éxito!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Comando no reconocido.\n"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "El comando final no fue confirmado.\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 procedimiento asume que su impresora is una Epson %s.\n"
+"Si éste no es el modelo de su impresora, favor de tipear ctrl-c ahora y\n"
+"elijir el correcto modelo de impresora.\n"
+"\n"
+"Favor de poner una hoja de papel en la impresora para comenzar el\n"
+"procedimiento de alineación del cabezal.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Presione enter para continuar > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"Favor de inspeccionar la impresión y elegir el mejor par de líneas en cada "
+"patrón.\n"
+"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Pasar #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, 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:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "¡Número fuera de rango!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "¡No puedo entender lo que usted ha tipeado!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Intentando definir alineación..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "éxito.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Favor de verificar que la alineación es correcta. Después que el patrón de\n"
+"alineación sea impreso nuevamente, favor de asegurarse que el mejor patrón\n"
+"para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
+"obtener la mejor calidad de impresión.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Error en entrada\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Imprimiendo..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Papel Opaco"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Postal"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
-msgstr "Papel Brillante de Altísima Calidad Fotográfica"
+msgid "Premium Presentation Paper Matte"
+msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Papel Común"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Papel Opaco"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Alimentación por Rollo"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr ""
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papel Brillante de Fotografía"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Manual"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "¿Imprimir a un archivo?"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manual"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manual"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Bandeja"
+msgid "ColorLife Paper"
+msgstr "Papel Común"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
-#, fuzzy
-msgid "Photo Board"
-msgstr "Papel para Fotografía"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Papel Común Carga Rápida"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Autoseleccionar"
+msgid "UltraChrome Photo Black"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600x600 PPP monocromo"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 PPP"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 PPP"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "1440 x 360 PPP Alta Calidad"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 PPP"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 PPP"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 PPP"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 PPP"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
 #, fuzzy
-msgid "720 DPI High Quality"
-msgstr "1200 PPP alta calidad"
+msgid "360 x 120 DPI Economy"
+msgstr "600x600 PPP monocromo"
 
-#: src/main/escp2-resolutions.c:103
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 DPI Highest Quality"
-msgstr "1200 PPP altísima calidad"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 PPP"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 PPP"
+msgid "720 DPI High Quality"
+msgstr "1200 PPP alta calidad"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
 #, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 PPP"
+msgid "720 DPI Highest Quality"
+msgstr "1200 PPP altísima calidad"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 PPP"
+msgid "Dark Yellow"
+msgstr "Amarillo"
+
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 PPP"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 PPP"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "Nombre de la Impresora:"
+msgid "Black 1"
+msgstr "Negro"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Negro"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 PPP"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 360 PPP Altísima Calidad "
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Bandeja"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manual"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "¿Imprimir a un archivo?"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Alimentación por Rollo"
+
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Nombre de la Impresora:"
+msgid "Manual Sheet Guide"
+msgstr "Manual"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Brillo:"
+msgid "Manual Feed (Front)"
+msgstr "Manual"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Papel para Fotografía"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Autoseleccionar"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "Altura:"
+msgid "One Color Raw"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "Fotografía"
+msgid "Three Color Raw"
+msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Four Color Raw"
+msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
+msgid "Five Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+#, fuzzy
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Siete Colores Mejorados"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Tres Colores Compuestos"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "Cuatro Colores Estándard"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
 #, fuzzy
-msgid "Photograph"
-msgstr "Fotografía"
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Arte lineal"
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+#, fuzzy
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Siete Colores Mejorados"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3210
 #, fuzzy
-msgid "Page"
-msgstr "Tamaño"
+msgid "Default Black"
+msgstr "Establecer por Omisión"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+#, fuzzy
+msgid "Seven Color Photo"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Seis Colores Compuestos Mejorados"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Image Type"
-msgstr "Tipo de Imagen :"
+msgid "Seven Color Raw"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Tipo de tinta de la impresora"
+msgid "Two Level Grayscale"
+msgstr "Tonos de gris"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+#, fuzzy
+msgid "Two Color Raw"
+msgstr "Cuatro Colores Estándard"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Fotografía de Seis Colores"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Fotografía de Seis Colores"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Fotografía de Seis Colores"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Nombre de la Impresora:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Tamaño"
+msgid "Interleave 2"
+msgstr "Nombre de la Impresora:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Tamaño"
+msgid "Eight Pass"
+msgstr "Brillo:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Carta"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Ejecutivo"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel Epson 4x6 de Fotografía"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Apaisado"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 #, fuzzy
 msgid "American foolscap"
 msgstr "Foolscap Americano"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 #, fuzzy
 msgid "European foolscap"
 msgstr "Foolscap Europeo"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 #, fuzzy
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 #, fuzzy
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 #, fuzzy
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 #, fuzzy
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Small paperback"
 msgstr "Paperback pequeño"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 #, fuzzy
 msgid "Penguin small paperback"
 msgstr "Penguin paperback pequeño"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 #, fuzzy
 msgid "Penguin large paperback"
 msgstr "Penguin paperback grande"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Tarjeta Hagaki"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Tarjeta Oufuku"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Sobre Japonés grande #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Sobre Japonés grande #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Sobre Japonés grande #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Sobre Japonés grande #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Sobre Japonés Kaku #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Sobre Japonés Kaku #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Comercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitación"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Sobre"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Sobre"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postal"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "Rollo de Papel de 89 mm"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "Rollo de Papel de 5 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "Rollo de Papel de 210 mm"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "Rollo de Papel de 13 Pulgadas"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "Rollo de Papel de 22 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "Rollo de Papel de 24 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "Rollo de Papel de 44 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "Rollo de Papel de 36 Pulgadas"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "Rollo de Papel de 4 Pulgadas"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Configuración de la Impresora"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Negro"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Pulgada"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Seleccionar la unidad base de medida a pulgadas"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Imprimir"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Seleccionar la unidad base de medida a pulgadas"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Seleccionar la unidad base de medida a pulgadas"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Salida de color"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Imprimir en sombras de gris usando tinta negra"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "Estándar"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Comando:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Archivo"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "¿Imprimir a un archivo?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Establecer por Omisión"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "Aceptar"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Conf. Impresora..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Imprimir v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Acerca de"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-#, fuzzy
-msgid ""
-"Print and\n"
-"Save Settings"
-msgstr "Configuración de la Impresora"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1369
-#, fuzzy
-msgid ""
-"Save\n"
-"Settings"
-msgstr "Guardar Conf."
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Imprimir"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Previsualizar"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-#, fuzzy
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"Posicione la imagen en la hoja.\n"
-"Seleccione y arrastre con el primer botón para posicionar la imagen.\n"
-"Seleccione y arrastre con el segundo botón para mover la imagen con\n"
-"mayor precisión; cada unidad de movimiento mueve la imagen un punto\n"
-"(1/72\")\n"
-"Seleccione y arrastre con el tercer botón (el medio) para mover la\n"
-"imagen en unidades del tamaño de la imagen.\n"
-"Sosteniendo la tecla 'shift' mientras se hace click y arrastra restringe\n"
-"el movimiento de la imagen a los ejes vertical y horizontal solamente.\n"
-"Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n"
-"posición original\n"
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "Tamaño"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Dimensiones:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Ancho:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Ancho del papel al que desea imprimir"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Altura:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Altura del papel al que desea imprimir"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "Tamaño"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Posición"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automático"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Vertical"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Apaisado"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Invertido"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Horizontal invertido"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
-"Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
-"invertido "
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientación:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Izquierda:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Distancia desde el borde izquierdo del papel al borde de la imagen"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Derecha:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
 msgstr ""
-"Distancia desde el borde izquierdo del papel al borde derecho de la imagen"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Distancia desde el borde derecho del papel al borde de la imagen"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Arriba:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Distancia desde el borde superior del papel al borde de la imagen"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Abajo:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
 msgstr ""
-"Distancia desde el borde superior del papel al borde inferior de la imagen"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Distancia desde el borde inferior del papel al borde de la imagen"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centrado: "
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Horizontal"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centrar la imagen horizontalmente en el papel"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Ambos"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centrar la imagen en el papel"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Vertical"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centrar la imagen verticalmente en el papel"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Configuración de la Impresora"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Nombre de la Impresora:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "Seleccionar su madelo de impresora"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Modelo de Impresora:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Seleccionar su madelo de impresora"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "Archivo PPD:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Explorar"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Elija el nombre de archivo PPD correcto para su impresora"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-#, fuzzy
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
-"Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
-"que desea imprimir"
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Nombre de la Impresora:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "prueba de impresión"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "¿Imprimir a un archivo?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Definir Nueva Impresora"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Nombre de la Impresora:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Ingrese el nombre que desea dar a ésta impresora lógica"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Acerca de Gimp-Print..."
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Versión de Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Configuración de la Impresora"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
-"Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
-"que desea imprimir"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Conf. Impresora..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
-"Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
-"imprimir a ésta impresora"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Impresora Nueva..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
-"Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una "
-"colección de configuraciones que usted desea recordar para uso futuro."
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Establecer por Omisión"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Tamaño"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Escala:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Establecer la escala (el tamaño) de la imagen"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Escalar por:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
-"Seleccionar si la escala se mide como porcentaje de la medida del papel "
-"disponible o número de puntos por pulgada en la salida."
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Porcentaje"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Redimensionar la impresión al tamaño de la página"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPP"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Establecer el ancho de la impresión"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Establecer el alto de la impresión"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"Usar Medida Orig.\n"
-"de la Imagen"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Establecer la medida de impresión a la medida de la imagen"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Ajuste de Impresión en Color"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Establecer por Omisión"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Cerrar"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Vista previa de imagen"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Tipo de salida:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Tipo de salida:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Seleccionar el tipo de salida deseado"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Ajustar Salida..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
-"Ajustar balance de color, brillo, contraste, saturacion, y algoritmo de "
-"entramado"
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Unidades:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Unidades:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Seleccionar la unidad base de medida para imprimir"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Imprimir"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Configuración de la Impresora"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Configuración de la Impresora"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Tipo de salida:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Comando:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "Bandeja 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "Bandeja 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "Bandeja 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "Bandeja 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Spanish"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
 msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
-"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n"
-"bajo los términos de la Licencia General Pública GNU tal como se la publica\n"
-"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n"
-"opción) cualquier versión posterior.\n"
-"\n"
-"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n"
-"GARANTÍA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n"
-"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más "
-"detalles.\n"
-"\n"
-"Usted debe haber recibido una copia de la Licencia General Pública GNU\n"
-"junto con éste programa; si no, escriba a la Fundación de Software\n"
-"Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307\n"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
-"Uso: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo]\n"
-"Realiza mantenimiento en impresoras EPSON Stylus (R).\n"
-"Ejemplos: escputil --clean-head --printer stpex-on-third-floor\n"
-"          escputil --ink-level --new --raw-device /dev/lp0\n"
-"\n"
-"  Comandos:\n"
-"    -c|--clean-head    Limpia el cabezal de impresión\n"
-"    -n|--nozzle-check  Imprime un patrón de prueba de toberas.\n"
-"                        Toberas sucias o tapadas se mostrarán como vacíos "
-"en\n"
-"                        el patrón. Si usted ve algún vacío, deberá limpiar\n"
-"                        el cabezal de impresión.\n"
-"    -a|--align-head    Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
-"                        de ésta utilidad puede resultar en una calidad "
-"pobre\n"
-"                        de impresión y/o daño a la impresora.\n"
-"    -o|--align-color   Alinear el cabezal de impresión color (Stylus Color\n"
-"                        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
-"         \t\tutilidad puede resultar en una calidad pobre de\n"
-"\t        \timpresión y/o daño a la impresora.\n"
-"    -s|--status        Recoger el status de la impresora.\n"
-"    -i|--ink-level     Obtener el nivel de tinta de la impresora. Ésto\n"
-"                        requiere acceso de lectura/escritura al dispositivo\n"
-"\t\t        crudo de impresión.\n"
-"    -d|--identify      Consultar la impresora por información de marca y\n"
-"                        modelo. Ésto requiere acceso de lectura/escritura "
-"al\n"
-"\t\t\tdispositivo crudo de impresión.\n"
-"    -l|--license       Mostrar los términos de la licencia/garantía de éste\n"
-"         \t\tprograma\n"
-"    -M|--list-models   Listar los modelos de impresora disponibles.\n"
-"    -h|--help          Imprimir éste mensaje de ayuda.\n"
-"  Opciones:\n"
-"    -P|--printer-name  Especifica el nombre de la cola de impresión en la\n"
-"\t\t\tque se opera. Por defecto es la impresora del\n"
-"\t\t\tsistema.\n"
-"    -r|--raw-device    Especifica el nombre del dispositivo a escribir\n"
-"\t\t\tdirectamente en vez de mandarlo a través de la cola\n"
-"                        de impresión.\n"
-"    -u|--new           La impresora es de nuevo modelo (Stylus Color 740 o\n"
-"                        más nueva).\n"
-"    -q|--quiet         Suprimir carteles.\n"
-"    -m|--model         Especificar el modelo preciso de impresora para\n"
-"\t\t\talineación de cabezal.\n"
 
-#: src/escputil/escputil.c:162
-#, fuzzy
-msgid ""
-"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
-"Uso: escputil [OPCIONES] [COMANDO]\n"
-"Uso: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo]\n"
-"Realiza mantenimiento en impresoras EPSON Stylus (R).\n"
-"Ejemplos: escputil -c -P stpex-on-third-floor\n"
-"          escputil -i -u -r /dev/lp0\n"
-"\n"
-"  Comandos:\n"
-"    -c Limpia el cabezal de impresión.\n"
-"    -n Imprime un patrón de prueba de toberas.\n"
-"        Toberas sucias o tapadas se mostrarán como vacíos en\n"
-"        el patrón. Si usted ve algún vacío, deberá limpiar\n"
-"        el cabezal de impresión.\n"
-"    -a Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
-"        de ésta utilidad puede resultar en una calidad pobre\n"
-"        de impresión y/o daño a la impresora.\n"
-"    -o Alinear el cabezal de impresión color (Stylus Color\n"
-"        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
-"        utilidad puede resultar en una calidad pobre de\n"
-"\t impresión y/o daño a la impresora.\n"
-"    -s Recoger el status de la impresora.\n"
-"    -i Obtener el nivel de tinta de la impresora. Ésto\n"
-"        requiere acceso de lectura/escritura al dispositivo\n"
-"\t crudo de impresión.\n"
-"    -d Consultar la impresora por información de marca y\n"
-"        modelo. Ésto requiere acceso de lectura/escritura al\n"
-"\t dispositivo crudo de impresión.\n"
-"    -l Mostrar los términos de la licencia/garantía de éste\n"
-"        programa\n"
-"    -M Listar los modelos de impresora disponibles.\n"
-"    -h Imprimir éste mensaje de ayuda.\n"
-"  Opciones:\n"
-"    -P Especifica el nombre de la cola de impresión en la\n"
-"\t que se opera. Por defecto es la impresora del\n"
-"\t sistema.\n"
-"    -r Especifica el nombre del dispositivo a escribir\n"
-"\t directamente en vez de mandarlo a través de la cola\n"
-"        de impresión.\n"
-"    -u La impresora es de nuevo modelo (Stylus Color 740 o\n"
-"        más nueva).\n"
-"    -q Suprimir carteles.\n"
-"    -m Especificar el modelo preciso de impresora para\n"
-"\t alineación de cabezal.\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo."
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Usted sólo puede especificar un modelo de impresora"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Opción desconocida %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "No puedo abrir dispositivo %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "No puedo imprimir a impresora %s con %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "No puedo enviar comando a impresora\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "No puedo leer %s de: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "No puedo abrir %s  para lectura/escritura: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Opción desconocida %s\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "No puedo escribir a %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"No puedo detectar el tipo de impresora.\n"
-"Favor de usar -m para especificar su modelo de impresora.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Saturación:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "Error en entrada\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "Error en entrada\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Configuración de la Impresora"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Color de tinta"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Porcentaje restante"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
 msgstr ""
-"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
 msgstr ""
-"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
 msgstr ""
-"La identificación de la impresora requiere el uso de un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Usted sólo puede especificar un modelo de impresora"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Limpiando inyectores...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
 msgstr ""
-"Ejecutando la prueba de los inyectores de tinta, favor de asegurarse que "
-"haya papel en la impresora.\n"
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
-"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
-"\n"
-"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
-"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
-"una degradación de la calidad de impresión y posiblemente daño a su "
-"impresora.\n"
-"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
-"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
-"utilidad corre por la exclusiva cuenta del usuario.\n"
-"\n"
-"Ésta utilidad imprime %d patrones de prueba. Cada patrón tiene aspecto muy\n"
-"similar. Los patrones consisten en una serie de pares de líneas verticales\n"
-"que se solapan. Debajo de cada par de líneas hay un número entre %d y %d.\n"
-"\n"
-"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
-"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
-"Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n"
-"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
-"más crítica.\n"
-"También se sugiere que use un papel de buena calidad para las pruebas,\n"
-"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
-"papel.\n"
-"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
-"de nuevo el papel en la impresora antes de volver a usarla.\n"
-"\n"
-"Cada patrón es similar, pero los últimos patrones usan puntos más finos\n"
-"para una alineación más crítica. Usted debe hacer todas las pasadas para\n"
-"alinear correctamente su impresora. Después de ejecutar todas las pasadas\n"
-"de alineación, los patrones de alineación se imprimirán una vez más. Debe\n"
-"observarse que el par medio entre todos (#%d de %d) es el mejor de todos\n"
-"los patrones.\n"
-"\n"
-"Después que los patrones sean impresos una vez más, le será ofrecida la\n"
-"elección de guardar (s) el resultado en la impresora, repetir el proceso\n"
-"(r), o salir sin guardar (q). Salir sin guardar no restaurará la\n"
-"configuración previa, pero apagar y volver a encender la impresora lo hará.\n"
-"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
-"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
-"durante éste proceso.\n"
-"\n"
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
-"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
-"\n"
-"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
-"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
-"una degradación de la calidad de impresión y posiblemente daño a su "
-"impresora.\n"
-"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
-"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
-"utilidad corre por la exclusiva cuenta del usuario.\n"
-"\n"
-"Ésta utilidad imprime un patrón de prueba que consiste en una serie de "
-"pares\n"
-"de líneas verticales que se solapan. Debajo de cada par de líneas hay un\n"
-"número entre %d y %d.\n"
-"\n"
-"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
-"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
-"Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n"
-"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
-"más crítica.\n"
-"También se sugiere que use un papel de buena calidad para la prueba,\n"
-"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
-"papel.\n"
-"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
-"de nuevo el papel en la impresora antes de volver a usarla.\n"
-"\n"
-"Después de ejecutar el patrón de alineación, éste se imprimirá una vez más.\n"
-"Debe observarse que el par medio entre todos (#%d de %d) es el mejor.\n"
-"Entonces le será ofrecida la elección de guardar (s) el resultado en la\n"
-"impresora, repetir el proceso (r), o salir sin guardar (q). Salir sin\n"
-"guardar no restaurará la configuración previa, pero apagar y volver a\n"
-"encender la impresora lo hará.\n"
-"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
-"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
-"durante éste proceso.\n"
-"\n"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "No puedo enviar comando a la impresora, saliendo.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
-"Favor de inspeccionar la salida final muy cuidadosamente para asegurar que\n"
-"su impresora se encuentre alineada. Usted puede ahora:\n"
-"  (s) Guardar los resultados en la impresora,\n"
-"  (q) Salir sin guardar los resultados, o\n"
-"  (r) Repetir el proceso completamente desde el principio.\n"
-"Luego le será requerido confirmar su elección.\n"
-"¿Qué opción elige? (s), (q), (r).\n"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 msgstr ""
-"Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
-"guardar:\n"
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 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:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
-"Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
-"proceso de alineado:\n"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Repitiendo el proceso de alineación.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
-"Ésto alterará permanentemente la configuración de su impresora.\n"
-"ADVERTENCIA: éste procedimiento no está aprobado por Seiko Epson, y\n"
-"puede dañar su impresora. ¿Proceder?\n"
-"Favor de confirmar que desea guardar la configuración de su impresora\n"
-"tipeando 's' de nuevo.\n"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Acerca de guardar configuración..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "¡falló!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
-"Su configuración no fue guardada exitosamente. Debe repetir el\n"
-"proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "¡éxito!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Su configuración de alineación fue guardada a la impresora.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Comando no reconocido.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "El comando final no fue confirmado.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
-"Éste procedimiento asume que su impresora is una Epson %s.\n"
-"Si éste no es el modelo de su impresora, favor de tipear ctrl-c ahora y\n"
-"elijir el correcto modelo de impresora.\n"
-"\n"
-"Favor de poner una hoja de papel en la impresora para comenzar el\n"
-"procedimiento de alineación del cabezal.\n"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Presione enter para continuar > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 msgstr ""
-"Favor de inspeccionar la impresión y elegir el mejor par de líneas en cada "
-"patrón.\n"
-"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Pasar #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Favor de insertar una hoja de papel sin imprimir.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "¡Número fuera de rango!\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "¡No puedo entender lo que usted ha tipeado!\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "El mejor par de líneas  debe ser numerado entre 1 y %d.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Intentando definir alineación..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "éxito.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
-"Favor de verificar que la alineación es correcta. Después que el patrón de\n"
-"alineación sea impreso nuevamente, favor de asegurarse que el mejor patrón\n"
-"para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
-"obtener la mejor calidad de impresión.\n"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Error en entrada\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Imprimiendo..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Tonos de gris"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Siete Colores Mejorados"
+
+#, fuzzy
+#~ msgid "720 x 720 DPI"
+#~ msgstr "2880 x 720 PPP"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Transposed"
+#~ msgstr "1440 x 1440 PPP"
+
+#, fuzzy
+#~ msgid "ISO A4"
+#~ msgstr "SRA4"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
@@ -8805,18 +12823,12 @@ msgstr "Imprimiendo..."
 #~ msgid "High Gloss Film"
 #~ msgstr "Película de Alto Brillo"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Papel Brillante de Fotografía"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Tarjetas Brillantes de Fotografía"
 
 #~ msgid "Photo Paper Pro"
 #~ msgstr "Papel de Fotografía Profesional"
 
-#~ msgid "CMY Color"
-#~ msgstr "Color CMY (Cian/Mag/Amar)"
-
 #~ msgid "CMYK Color"
 #~ msgstr "Color CMYK (Cian/Mag/Amar/Negro)"
 
@@ -9443,9 +13455,6 @@ msgstr "Imprimiendo..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Tipo de medio al que usted está imprimiendo"
 
-#~ msgid "Media Size:"
-#~ msgstr "Tamaño del medio:"
-
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "Tamaño del papel al que desea imprimir"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 26eb090..0e27333 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index f5f5124..a35fdcf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 5.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2007-11-23 11:55-0500\n"
 "Last-Translator: regis rampnoux <regisr@pobox.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Défaut"
 
@@ -94,18 +94,19 @@ msgstr ""
 msgid "Density"
 msgstr "Densité"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr "Réglage du niveau de sortie"
 
@@ -162,9 +163,9 @@ msgstr "Module de conversion de couleur"
 msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Format papier "
 
@@ -172,305 +173,350 @@ msgstr "Format papier "
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "Configuration de base de l'imprimante"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Taille du papier sur lequel vous imprimez"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Type de support"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type de support (papier ordinaire, papier photo etc.)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Source du support"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Source (bac) du support vers lequel vous imprimez"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr "Taille du moyeu du CD"
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 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:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 #, fuzzy
 msgid "CD Hub Size (Custom)"
 msgstr "Taille du moyeu du CD"
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, 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:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Réglage horizontal précis du CD"
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Réglages imprimante avancés"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 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:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr "Réglage vertical précis du CD"
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Résolution"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Résolution et qualité de l'impression"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type d'encre"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Encres installées"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr "Encres (canaux)"
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Fonctionalités avancées"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Mode d'impression"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Paramètres principaux"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Mode de sortie"
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "Impression double face"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr "Paramètres Duplex"
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Qualité d'impression"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr "Réglage de base"
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Densité cyan"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Ajustement de la densité de cyan"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Densité magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Ajustement de la densité de magenta"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Densité jaune"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Ajustement de la densité de jaune"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Densité du noir"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Ajustement du niveau de densité"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Passage cyan clair"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Réglage avancé des encres"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr "Transition magenta clair"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr "Transition jaune clair"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr "Désactivé"
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Côté long (standard)"
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr "Côté court (retourné)"
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "CD - 5 pouces"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "CD - 3 pouces"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personnalisé"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr "Imprimer sue le moyeu"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Noir et blanc"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Controle manuel"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Haute précision"
@@ -503,9 +549,8 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pré-tramé"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -521,11 +566,11 @@ msgstr "RVB"
 msgid "CMY"
 msgstr "CMJ"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMJN"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "NCMJ"
 
@@ -585,7 +630,7 @@ msgid "Output image type"
 msgstr "Type de sortie :"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr "Canaux raw"
 
@@ -648,16 +693,56 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr "Valeur gamma prévue par l'application"
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -665,16 +750,56 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Réglage du gamma pour le cyan"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -682,16 +807,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Réglage du gamma pour le magenta"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Jaune"
 
@@ -699,9 +864,11 @@ msgstr "Jaune"
 msgid "Adjust the yellow gamma"
 msgstr "Réglage du gamma pour le jaune"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "Rouge"
 
@@ -709,7 +876,7 @@ msgstr "Rouge"
 msgid "Adjust the red gamma"
 msgstr "Réglage du gamma pour le rouge"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "Vert"
 
@@ -717,9 +884,10 @@ msgstr "Vert"
 msgid "Adjust the green gamma"
 msgstr "Réglage du gamma pour le vert"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "Bleu"
 
@@ -728,16 +896,54 @@ msgid "Adjust the blue gamma"
 msgstr "Réglage du gamma pour le bleu"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Noir"
 
@@ -745,7 +951,7 @@ msgstr "Noir"
 msgid "Adjust the black gamma"
 msgstr "Réglage du gamma pour le noir"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "Niveau de cyan"
 
@@ -758,7 +964,7 @@ msgstr "Balance des gris"
 msgid "Adjust the cyan gray balance"
 msgstr "Réglage du cyan pour la balance des gris"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "Niveau de magenta"
 
@@ -766,7 +972,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "Niveau de jaune"
 
@@ -794,10 +1000,11 @@ msgstr "Limite d'encrage"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr "Controle avancé de la sortie"
 
@@ -807,27 +1014,27 @@ msgstr ""
 "Limite l'encre utilisée au total\n"
 "(peut être laissé au nombre d'encres)"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr "Transition GCR"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr "Régle le taux de transition de la composante gris"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr "Limite basse GCR"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr "Limite basse de la composante gris"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr "Limite haute GCR"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr "Limite haute de la composante gris"
 
@@ -956,77 +1163,77 @@ msgstr "Courbe de la composante gris"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Conversion de couleur traditionelle Gutenprint"
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Valeur à définir pour: %s\n"
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s n'est pas une valeur valide pour %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s doit être entre %f et %f (actuellement %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s doit être entre %d et %d (actuellement %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s limites doivent être entre %f et %f\n"
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s wrap mode doit être %s\n"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "paramètre de type inconnu %s (%d)\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s hors-intervalle (valeur %d, mini %d, maxi %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "La taille de la page n'est pas valide\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "La marge supérieure ne doit pas être plus petite que %d\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "La marge gauche ne doit pas être plus petite que %d\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr "La hauteur doit être supérieure à zéro\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr "La largeur doit être plus grande que zéro\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1035,7 +1242,7 @@ msgstr ""
 "L'image est trop large pour la page: marge gauche %d, largeur %d, bord droit "
 "%d\n"
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1044,390 +1251,458 @@ msgstr ""
 "L'image est trop haute pour la page: marge en haut %d, hauteur %d, bord du "
 "bas %d\n"
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr "Mode d'impression automatique"
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr "Réglage de base"
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "Mode d'impression automatique"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "Qualité d'impression"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "Résolution de l'impression"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr "Amélioration de la brillance"
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr "Ajouter l'amélioration de brillance"
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr "Jeu d'encres"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "Sens d'impression"
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr "Réglage avancé de sorties"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 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:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr "sans marges"
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr "Impression sans marges"
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr "Méthode d'entrelacement"
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr "Motif d'entrelacement"
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr "Ajuster la taille des gouttes si nécessaire"
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-"Ajuster la taille des gouttes si nécessaire pour obtenir la densité souhaitée"
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr "Ordre de sortie"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr "Commande de changement d'encre"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr "Choix d'alignement alternatif"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr "Supporte le mode paquet"
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 #, fuzzy
 msgid "Supports D4 Packet Mode"
 msgstr "Supporte le mode paquet"
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr "Nom des canaux"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr "Carte du cyan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr "Modification de la carte du cyan"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr "Carte du magenta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr "Modification de la carte du majenta"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr "Carte du jaune"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr "Modification de la carte du jaune"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr "Carte du bleu"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr "Modification de la carte du bleu"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Carte du cyan"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Modification de la carte du rouge"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr "Carte du rouge"
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr "Modification de la carte du rouge"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Densité du rouge"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Ajuste la densité du rouge"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Densité du bleu"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Ajuste la densité du bleu"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Densité cyan"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Ajuste la densité du rouge"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr "Niveau de brillance"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr "Ajuste le niveau de brillance"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Densité cyan"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Magenta clair"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Densité magenta"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Jaune foncé"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr "transition jaune foncé"
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Densité jaune"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Niveaux de gris"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 msgstr "Transition gris"
 
-#: src/main/print-escp2.c:614 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:639
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Niveaux de gris"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Niveaux de gris"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr "Transition gris médian"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Transition gris médian"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
+#, fuzzy
+msgid "Paper Thickness"
+msgstr "Taille du papier"
+
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Valeurs par défaut"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Densité du noir"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
+#, fuzzy
+msgid "Print Method"
+msgstr "Mode d'impression"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Papier ordinaire"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+#, fuzzy
+msgid "Feed Adjustment"
+msgstr "Réglage fin"
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
 msgid "Full Manual Control"
 msgstr "Contrôle manuel complet"
 
-#: src/main/print-escp2.c:2001
+#: src/main/print-escp2.c:1966
 msgid "Automatic Setting Control"
 msgstr "Controle réglage automatique"
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Controle manuel"
-
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr "Bidirectionnel"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr "Unirectionnel"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr "en alternance"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr "en montant"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr "en descendant"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr "en montant - double"
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr "en évitant les voisins"
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+#, fuzzy
+msgid "Short Edge(Flip)"
+msgstr "Côté court (retourné)"
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: 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"
 
@@ -1480,129 +1755,356 @@ msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Quatre couleurs standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Trois couleurs composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Six couleurs photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Papier ordinaire"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Film brillant"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Transparents"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Enveloppes"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier jet d'encre qualité photo"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Papier glacé qualité photo"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Papier épais Ilford"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Autre"
 
@@ -1618,170 +2120,193 @@ msgstr "Manuel avec pause"
 msgid "Manual without Pause"
 msgstr "Manuel sans pause"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr "Couché"
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr "Aucun"
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr "Brillant"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr "Motif du vernis protecteur"
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "Réglage balance cyan"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "Réglage balance magenta"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "Réglage balance jaune"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "Balance du noir"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "Réglage de la balance du noir"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Normal"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Photo brillant"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Transparent"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Photo séchage rapide"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Transparent séchage rapide"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Bac 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Bac 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Bac 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Bac 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Chargeur de feuille portable"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Chargeur de feuille de bureau"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Bac"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Source optionnelle"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Sélection auto"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 PPP"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 PPP"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 PPP"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600 x 600 ppp Monochrome"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 PPP"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 PPP"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400 x 600 ppp"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr "Brouillon"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr "Hauteur"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "Photo"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Cartouches couleur et noir"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Cartouches couleur et photo"
 
@@ -1789,6511 +2314,10217 @@ msgstr "Cartouches couleur et photo"
 msgid "PPDFile"
 msgstr "Fichier PPD"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "Fichier PPD"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Nom des canaux"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "EChelle de gris à deux niveaux"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr "Rapide (économique)"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
-msgstr "Trois niveaux de gris"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr "Economique"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
+msgstr "Super Photo"
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
+msgstr "Ultra photo"
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr "Meilleur"
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Texte"
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Graphiques"
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Texte et graphiques"
+
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Photographie"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Crayon"
+
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Page"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Travail"
+
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Type d'image"
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Type d'image à imprimer"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Mode de travail"
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Mode Travail/Page"
+
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Page numéro"
+
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Page numéro"
+
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Type de courbe"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "Courbe linéaire, interpolée ou libre"
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Minimum X"
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Valeur minimum possible pour X"
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Maximum X"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Valeur maximum possible pour X"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Minimum Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Valeur minimum possible pour Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Maximum Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Valeur maximum possible pour Y"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "Valeur gamma"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Pouce"
 
-#: src/main/escp2-channels.c:1466
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Défini l'unité de base de mesure en pouce"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Défini l'unité de base de mesure en centimètres"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Points"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Défini l'unité de base de mesure en points (1/72\")"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr "mm"
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Défini l'unité de base de mesure en millimètres"
+
+#: 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 "Défini l'unité de base de mesure en pica (1/72\")"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Sortie couleur"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Commande standard"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Utiliser la commande d'impression standard"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Commande personnalisée"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Utiliser une commande personnalisée"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Fichier"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Imprimer dans un fichier"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Editer la courbe..."
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Valeurs par défaut"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Valeurs précédentes"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr "Valider"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/gutenprintui2/panel.c:642
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Six couleurs photo"
+msgid "Select File..."
+msgstr "Configurer l'imprimante..."
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Six couleurs amélioré composite"
+#: src/gutenprintui2/panel.c:1028
+#, fuzzy
+msgid "Reset"
+msgstr "Meilleur"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Photo sept couleurs"
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Print v%s"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Sept couleurs amélioré"
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "À propos"
 
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
-msgstr "Huit couleurs photo"
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Imprimer et enregistrer\n"
+"les réglages"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "Une couleur de base"
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Enregistrer\n"
+"les réglages"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Une couleur de base optimiseur de brillance"
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Imprimer"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "Deux couleurs de base"
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Aperçu"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
-msgstr "Trois couleurs de base"
+#: 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 ""
+"Positionnement de l'image sur la page.\n"
+"Cliquez et Glissez avec le premier bouton pour positionner l'image sur la "
+"page.\n"
+"Cliquez et Glissez avec le second bouton pour déplacer l'image avec "
+"précision, chaque unité de mouvement déplace l'image d'un point (1/72\")\n"
+"Cliquez et Glissez avec le troisième (milieu) bouton pour déplacer l'image "
+"en unités de taille d'image.\n"
+"Maintenir la touche Maj enfoncée en Cliquant et Glissant contraint l'image à "
+"se déplacer horizontalement ou verticalement.\n"
+"Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
+"retournera à sa position de départ."
 
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
-msgstr "Trois couleurs de base brillant"
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Taille du papier"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "Quatre couleurs de base"
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Afficher tout les formats"
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
-msgstr "Quatre couleurs de base brillant"
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Dimensions :"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
-msgstr "Cinq couleurs de base"
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Largeur :"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Six couleurs de base"
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Six couleurs de base Optimiseur de brillance"
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Hauteur :"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Sept couleurs de base"
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sept couleurs de base Optimiseur de brillance"
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Taille papier automatique"
 
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
-msgstr "Huit couleurs de base"
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Nombre d'exemplaires"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
-msgstr "Encres standard EPSON"
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Choisir le nombre d'exemplaires à imprimer, entre 1 et 100"
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
-msgstr "Ultrachrome noir photo"
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Position de l'image"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
-msgstr "Ultrachrome noir mat"
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Portrait"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Paysage"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Retourné (haut/bas)"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Paysage retourné (haut/bas)"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné "
+"(retourné haut/bas)"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientation :"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Gauche:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Distance entre le bord gauche du papier et l'image"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Droite:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Distance entre le bord gauche du papier et le bord droit de l'image"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Distance entre le bord droit du papier et l'image"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Haut:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Distance entre le bord supérieur du papier et l'image"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Bas :"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr ""
+"Distance entre le bord supérieur du papier et le bord inférieur de l'image"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Distance entre le bord inférieur du papier et l'image"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centrer:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Horizontalement"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centrer l'image horizontalement sur le papier"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Les deux"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centrer l'image sur le papier"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Verticalement"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centrer l'image verticalement sur le papier"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Configuration de l'imprimante"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Marque de l'imprimante :"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Sélectionnez la marque de votre imprimante"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Modèle d'imprimante :"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Sélectionnez le modèle de votre imprimante"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "Fichier PPD:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Entrez le nom de fichier PPD pour votre imprimante"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Parcourir"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Choisissez le fichier PPD correct pour votre imprimante"
+
+#: 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 ""
+"Sélectionnez le nom de la file d'attente (pas le type ni le modèle "
+"d'imprimante) que vous voulez utiliser pour l'impression"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "File d'attente:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Entrez la commande pour imprimer sur votre imprimante"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Entrez le nom du fichier."
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "fichier d'impression"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Imprimer dans un fichier ?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Définir une nouvelle imprimante"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Nom de l'imprimante :"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "À propos de Gutenprint"
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Version de Gutenprint"
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Paramètres de l'imprimante"
+
+#: 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 ""
+"Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
+"voulez utiliser pour l'impression"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Configurer l'imprimante..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
+"pour l'impression sur cette imprimante"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Nouvelle imprimante..."
+
+#: 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 ""
+"Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un "
+"ensemble de réglage que vous souhaitez réutiliser plus tard."
+
+#: src/gutenprintui2/panel.c:2150
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Valeurs par défaut"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Taille de l'image"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Échelle:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Régler l'échelle (taille) de l'image"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Mise à l'échelle en "
+
+#: 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 ""
+"Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page "
+"ou en nombre de points par pouces"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Pourcentage"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Dimensionne l'impression par rapport à la taille de la page"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "points par pouce"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Dimensionne l'impression en nombre de points par pouce"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Défini la largeur de l'impression"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Défini la hauteur de l'impression"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Utiliser la taille \n"
+"de l'image originale"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Utiliser la taille de l'image comme taille d'impression"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Ajustement des couleurs d'impression"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Valeurs par défaut"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Fermer"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Aperçu de l'image"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "Visualisation canaux de sortie"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Sortie"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Type de sortie:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Sélectionnez le type de sortie désiré"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Réglages fins..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
+"algorithme de tramage"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Unités de taille:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Unités:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Sélectionne l'unité de base de mesure pour l'impression"
+
+#: 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 "Imprimante"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(imprimante par défaut)"
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr "Caractéristiques de l'imprimante"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr "contrôle de sortie"
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr "Commun"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr "Extra1"
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr "Extra2"
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr "Extra3"
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr "Extra4"
+
+#: src/cups/genppd.c:155
+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
+msgid "English"
+msgstr "French"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Source du support"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Mode de travail"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Niveaux de gris"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Couleur"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "Couleur CMJ"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+#, fuzzy
+msgid "Color Precision"
+msgstr "Correction des couleurs"
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+#, fuzzy
+msgid "Reverse"
+msgstr "Meilleur"
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Impression double face"
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "Non"
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "Oui"
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#, fuzzy
+msgid "Value"
+msgstr "Bleu"
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr "Réglage fin"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Version d'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 ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Ce programme est un logiciel libre, vous pouvez le redistribuer et/ou le "
+"modifier\n"
+"sous les termes de la licence GNU GPL General Public License telle que "
+"publiée\n"
+"par la Free Software Foundation, soit la version 2 de la licence, ou (à "
+"votre choix)\n"
+"toute version ultérieure.\n"
+"\n"
+"Ce programme est distribuée dans l'espoir qu'il sera utile, mais SANS\n"
+"GARANTIE; sans même la garantie impliquée par la COMMERCIALISATION \n"
+"ou l'ACCORD POUR UN USAGE PARTICULIER. Voyez la licence GNU General Public "
+"License\n"
+"pour plus de détails.\n"
+"\n"
+"Vous devriez avoir reçu une copie de la GNU General Public License fournie\n"
+"avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\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 ""
+"Utilisation : escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                       [-P imprimante | -r périphérique] [-u] [-q] [-m "
+"modèle] [ -S ]\n"
+"Effectue des opérations de maintenance sur les imprimantes EPSON Stylus "
+"(R).\n"
+"Exemples : escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"Commandes :\n"
+"   -c|--clean-head    Nettoie la tête d'impression\n"
+"   -n|--nozzle-check  Imprime un motif de test des buses.\n"
+"                      Les buses sales ou bouchées apparaîtront comme des\n"
+"                      trous dans le motif. Si vous en voyez vous devrier "
+"nettoyer \n"
+"                      tête d'impression.\n"
+"   -a|--align-head    Aligne la tête d'impression. ATTENTION : une mauvaise\n"
+"                      utilisation de cette fonction peut provoquer une "
+"mauvaise\n"
+"                      qualité d'impression et/ou endommager l'imprimante.\n"
+"   -s|--status        Indique le statut de l'imprimante.\n"
+"   -i|--ink-level     Récupère le niveau d'encre de l'imprimante. Cela "
+"nécessite\n"
+"                      un accés en lecture/écriture sur le périphérique \n"
+"                      en mode caractère (raw).\n"
+"  -e|--extended-ink-info    Récupère les informations complémentaires \n"
+"                      sur les encres. Cette commande nécessite\n"
+"                      un accés en lecture/écriture sur le périphérique \n"
+"                      en mode caractère (raw).\n"
+"   -d|--identify      Demande à l'imprimante des renseignements sur la "
+"marque\n"
+"                      et le modèle. Cela nécessite un accés en lecture/"
+"écriture\n"
+"                      sur le périphérique en mode caractère (raw) .\n"
+"   -l|--license       Affiche la licence de ce programme.\n"
+"   -M|--list-models   Affiche les modèles d'imprimante supportés.\n"
+"   -h|--help          Affiche ce message d'aide.\n"
+" \n"
+"Options :\n"
+"   -P|--printer-name  Indique le nom de la file d'attente d'impression à \n"
+"                      utiliser. Par défaut, utilisation de l'imprimante du \n"
+"                      par défaut du système.\n"
+"   -r|--raw-device    Indique le nom d'un périphérique sur lequel écrire \n"
+"                      directement au lieu d'utiliser une file d'attente \n"
+"                      pour l'impression.\n"
+"   -u|--new           L'imprimante est une imprimante récente (Stylus Color "
+"740\n"
+"                      ou plus récent). Utile uniquement si le périphérique \n"
+"                      n'est pas en mode caractère (raw).   -q|--"
+"quiet         N'affiche pas la bannière.\n"
+"   -S|--short-name    Affiche le nom court de l'imprimante avec --identify.\n"
+"   -m|--model         Indique le modèle précis pour l'alignement des têtes.\n"
+"   -C|--choices       Nombre de choix de motifs pour l'alignement\n"
+"   -p|--patterns      Numéro des jeux de motifs pour l'alignment\n"
+
+#: src/escputil/escputil.c: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 ""
+"Usage: escputil [OPTIONS] [COMMANDE]\n"
+"Usage: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model]\n"
+"Maintenance sur les imprimantes EPSON Stylus (R).\n"
+"Exemples: escputil -c -P stpex-on-third-floor\n"
+"          escputil -i -u -r /dev/lp0\n"
+"\n"
+"  Commandes:\n"
+"    -c Nettoie la tête d'impression.\n"
+"    -n Imprime une trame de test des buses.\n"
+"          Des buses sales ou bouchées se verront comme des espaces dans la\n"
+"          trame. Si vous voyez un quelconque espace, vous devriez nettoyer\n"
+"          la tête d'impression.\n"
+"    -a Alignement de la tête d'impression.  ATTENTION: une mauvaise "
+"utilisation de cet\n"
+"          utilitaire peut conduire à une piètre qualité d'impression et/ou\n"
+"          endommager l'imprimante.\n"
+"    -o Alignement des têtes d'impression couleur (Stylus Color 480 and 580\n"
+"          seulement).  ATTENTION: une mauvaise utilisation de cet utilitaire "
+"peut\n"
+"          conduire à une piètre qualité d'impression et/ou endommager "
+"l'imprimante.\n"
+"    -s Retrouver le status de l'imprimante.\n"
+"    -i Obtenir le niveau d'encre de l'imprimante.  Ceci nécessite\n"
+"          un accès en lecture/écriture au périphérique d'entrée.\n"
+"    -d Interroge l'imprimante sur la marque et le modèle de l'imprimante."
+"Ceci nécessite\n"
+"          un accès en lecture/écriture au périphérique d'entrée.  \n"
+"    -l Affiche les termes de licence/garantie de ce programme.\n"
+"    -M Liste les modèles d'imprimantes disponibles.\n"
+"    -h Imprime ce message d'aide.\n"
+"  Options:\n"
+"    -P Spécifie le nom de la queue d'imprimante sur laquelle opérer.\n"
+"          Par déaut l'imprimante système.\n"
+"    -r Spécifie le nom du périphérique sur lequel écrire directement\n"
+"          plutôt que de passer via une queue d'impression.\n"
+"    -u L'imprimante est une nouvelle imprimante (Stylus Color 740 ou plus "
+"récente).\n"
+"    -q Supprime la bannière.\n"
+"    -m Spécifie le modèle précis pour l'alignement des têtes.\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Vous ne pouvez spécifier qu'une imprimante ou périphérique"
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Le choix de l'alignement doit être au moins 1."
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Le nombre de passes d'alignement doit être au moins de 1."
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Option inconnue %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Usage: %s [OPTIONS] command\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Tapez `%s --help' pour plus d'information.\n"
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Tapez  `%s -h' pour plus d'information.\n"
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Impossible d'ouvrir le périphérique %s : %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Impossible d'envoyer la commande à l'imprimante\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Lecture données de l'imprimante: temps excédé\n"
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Impossible de lire à partir de %s : %s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Option inconnue %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Impossible d'écrire sur %s : %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Impossible d'écrire sur %s : %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Impossible de détecter le type de l'imprimante.\n"
+"Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr "Noir photo"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
-msgstr "Noir Mat"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr "Cyan clair"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr "Noir clair"
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
-msgstr "Jaune foncé"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
+msgstr "Noir Mat"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr "Optimiseur de brillance"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr "Noir très clair"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Papier normal chargement rapide"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Page"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr "Etat: Erreur\n"
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Etat: auto-impression\n"
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Etat: occupé\n"
+
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Etat: Attente\n"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Etat: Libre\n"
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Etat: Pause\n"
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Etat: Nettoyage\n"
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Etat: Configuration usine\n"
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Etat: Arrêt en cours\n"
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Etat: Inconnu (%d)\n"
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Erreur: Erreur fatale\n"
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Erreur: une autre interface est sélectionnée\n"
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Erreur: ouvercle ouvert\n"
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Erreur: Bourrage papier\n"
+
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Erreur: plus d'encre\n"
+
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Erreur: Pas de papier\n"
+
+#: src/escputil/escputil.c:1078
+#, fuzzy, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Erreur: Erreur massicot non récupérable\n"
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, 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:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Erreur: double chargement\n"
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Erreur: Erreur massicot non récupérable\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Erreur: bourrage massicot (récupérable)\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Erreur: couvercle du support ouvert\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Erreur: Support CD sorti\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Erreur: Chargement de la carte\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Erreur: couvercle du support ouvert\n"
+
+#: src/escputil/escputil.c:1114
+#, fuzzy, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Erreur: couvercle du support ouvert\n"
+
+#: src/escputil/escputil.c:1117
+#, fuzzy, c-format
+msgid "Error: Front cover open\n"
+msgstr "Erreur: couvercle du support ouvert\n"
+
+#: src/escputil/escputil.c:1120
+#, fuzzy, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Erreur: une autre interface est sélectionnée\n"
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Error: Inconnue (%d)\n"
+
+#: src/escputil/escputil.c:1135
+#, fuzzy, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Attention: Encre noire niveau bas\n"
+
+#: src/escputil/escputil.c:1138
+#, fuzzy, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Attention: Encre noire niveau bas\n"
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Attention: Inconnu (%d)\n"
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Impression autotest des buses\n"
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Niveau d'encres:\n"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Encre couleur"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Pourcentage restant"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Nom de l'imprimante :"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr "Nom du travail: "
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr "niveau d'encres"
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "état"
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr "Numéro de pièce"
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "Date"
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Nettoyage des têtes...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
+"\n"
+"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
+"imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
+"utilitaire\n"
+"peut dégrader la qualité d'impression de votre imprimante et endommager "
+"votre\n"
+"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
+"n'offre\n"
+"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
+"\n"
+"Cet utilitaire imprime %d trames de test. Chaque trame apparait très "
+"similaire.\n"
+"Les trames sont constituées d'une série de paire de lignes verticales qui "
+"se\n"
+"superposent. Sous chaque paire de lignes il y a un nombre compris entre %d "
+"et %d.\n"
+"\n"
+"Quand vous inspectez les paires de lignes, vous devriez trouver la paire "
+"de \n"
+"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
+"simple ligne verticale. Inspectez les paires avec tout votre attention pour\n"
+"trouver la meilleure. Utilisez une loupe ou un verre grossisseur et "
+"recommandé\n"
+"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
+"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
+"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
+"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
+"dans\n"
+"le chargeur avant de le taper.\n"
+"\n"
+"Chaque trame est similaire, mais les dernières trames utilisent des points \n"
+"plus fins pour un alignement plus critique. Vous devez lancer toutes les\n"
+"passes pour aligner corectement votre imprimante. Après avoir lancé toutes \n"
+"les passes, la trame d'alignement va être imprimée encore une fois. Vous\n"
+"devriez trouver que la paire la plus au milieu (#%d en dehors de %d) est\n"
+"la meilleure pour toute les trames.\n"
+"\n"
+"Après que les passes seront imprimées encore une fois, vous devrez choisir\n"
+"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
+"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
+"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
+"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
+"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
+"durant cette opération.\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
+"\n"
+"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
+"imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
+"utilitaire\n"
+"peut dégrader la qualité d'impression de votre imprimante et endommager "
+"votre\n"
+"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
+"n'offre\n"
+"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
+"\n"
+"Cet utilitaire imprime une trame de test.constituée d'une série de paire "
+"de \n"
+"lignes verticales qui se superposent. Sous chaque paire de lignes il y a \n"
+"un nombre compris entre %d et %d.\n"
+"\n"
+"Quand vous inspectez les paires de lignes, vous devriez trouver la paire "
+"de \n"
+"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
+"simple ligne verticale. Inspectez les paires avec tout votre attention pour\n"
+"trouver la meilleure. Utilisez une loupe ou un verre grossisseur et "
+"recommandé\n"
+"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
+"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
+"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
+"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
+"dans\n"
+"le chargeur avant de le taper.\n"
+"\n"
+"Après avoir lancé la trame d'alignement, elle va être imprimée encore une "
+"fois.\n"
+"Vous devriez trouver que la paire la plus au milieu (#%d en dehors de %d)\n"
+"est la meilleure pour toute les trames. Ensuite vous devrez choisir\n"
+"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
+"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
+"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
+"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
+"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
+"durant cette opération.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr "uitte.\n"
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"S'il vous plait inspectez la sortie finale avec attention pour vous\n"
+"assurez que votre imprimante est correctement alignée. Vous\n"
+"pouvez maintenant :\n"
+"  (s)auvegarder les rsulats dans votre imprimante\n"
+"  (q)uitter sans enregistrer les résultats, ou\n"
+"  (r)épéter entièrement l'opération depuis le début.\n"
+"Il vous sera ensuite demandé de confirmer votre choix\n"
+"Que voulez-vous faire (s, q, r) ?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+"Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
+"enregistrer :\n"
+
+#: src/escputil/escputil.c:1892
+#, 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 ""
+"OK, votre imprimante est alignée, mais l'alignement n'a pas été enregistré.\n"
+"Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
+"opération.\n"
+
+#: src/escputil/escputil.c:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
+"reprendre l'opération d'alignement.\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Répétition de l'opération d'alignement.\n"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Ceci va altérer la configuration de votre imprimante.\n"
+"ATTENTION cette opération n'a pas été approuvée par EPSON Seikp\n"
+"et elle peut endommager votre imprimante; Procéder ?\n"
+"Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
+"enregistrer les réglages de votre imprimante.\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "À propos de l'enregistrement des réglages..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "Échec !\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
+"l'opération d'alignement.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "Succès !\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Commande non reconnue.\n"
+
+#: src/escputil/escputil.c:1945
+#, 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:1950
+#, fuzzy, 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 ""
+"Cette opération prend en compte que votre imprimante est une Epson %s.\n"
+"Si ce n'est pas votre modèle d'imprimante, s'il vous plait tapez Control-C\n"
+"et choisissez votre modèle actuel d'imprimante.\n"
+"\n"
+"S'il vous plait placez une feuillle de papier dans votre imprimante\n"
+"pour commencer l'opération d'ailgnement des têtes.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Pressez Entrée pour continuer > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"S'il vous plait inspectez l'impression et choisissez la meilleure paire de "
+"lignes dans chaque trame.\n"
+"Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Passe #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, 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:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Nombre hors-intervalle !\n"
+
+#: src/escputil/escputil.c:2071
+#, 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:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Tentative de réglage de l'alignement..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "Succès.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"S'il vous plait vérifiez que l'alignement est correct. après que la trame\n"
+"d'alignement soit imprimée à nouveau, assurez-vous que la meilleure\n"
+"trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n"
+"devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Erreur en entrée\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Impression en cours..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr "Encres standard EPSON"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Papier Mat"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Carte postale"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "Film back light"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 msgid "Matte Paper Heavyweight"
 msgstr "Papier Mat Heavyweight"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
-msgstr "Papier semi-brillant photo Premium"
-
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-msgid "ColorLife Paper"
-msgstr "Papier Colorlife"
-
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-msgid "Archival Matte Paper"
-msgstr "Papier Mat Archival"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr "Papier aquarelle - radiant white"
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Premium Presentation Paper Matte"
+msgstr "Papier photo Premium Luster"
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Alimentation rouleau"
+#: src/xml/xmli18n-tmp.h:27
+#, fuzzy
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papier glacé photo Premium"
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr "Alimentation rouleau (couper chaque page)"
+#: src/xml/xmli18n-tmp.h:29
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Papier glacé photo Premium"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr "Alimentation rouleau (sans découpe des pages)"
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papier brillant qualité photo"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
+msgstr "Papier semi-brillant photo Premium"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "Alimentation manuelle"
+#: src/xml/xmli18n-tmp.h:35
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Papier semi-brillant photo Premium"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "Imprimer un CD"
+#: src/xml/xmli18n-tmp.h:37
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Papier semi-brillant photo Premium"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
-msgstr "Alimentation guide par feuille (arrière)"
+#: src/xml/xmli18n-tmp.h:41
+#, fuzzy
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Papier photo Premium Luster"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-msgid "Manual Feed (Front)"
-msgstr "Alimentation manuelle (avant)"
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Papier glacé photo Premium"
 
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
-msgstr "Bac arrière"
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+msgid "ColorLife Paper"
+msgstr "Papier Colorlife"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr "Bac avant"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
 
-#: src/main/escp2-papers.c:1988
-msgid "Photo Board"
-msgstr "Carte photo"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Papier normal chargement rapide"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr "Coupe papier Bin 1"
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+msgid "Archival Matte Paper"
+msgstr "Papier Mat Archival"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
-msgstr "Coupe papier Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr "Papier aquarelle - radiant white"
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
-msgstr "Sélection de coupe automatique"
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
+msgstr "Ultrachrome noir photo"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
-msgstr "Sélection manuelle"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr "Ultrachrome noir mat"
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360x90 ppp rapide économique"
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 ppp Economique"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr "180 ppp Economique"
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 ppp brouillon"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
-msgstr "360 x 240 ppp brouillon"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 ppp Haute qualité"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 ppp"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 x 360 ppp"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 ppp"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 ppp"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr "720 ppp Haute qualité"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
+msgstr "360 x 120 ppp Economique"
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 ppp Qualité maximale"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr "360 x 240 ppp brouillon"
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
-msgstr "720 x 720 ppp"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr "720 ppp Haute qualité"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 ppp Transposé"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 ppp Qualité maximale"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 ppp transposé"
-
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
-msgstr "5760 x 1440 ppp"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr "Jaune foncé"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 ppp"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
+msgstr "5760 x 1440 ppp"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 ppp"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr "Actif"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 ppp Transposé"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
-msgstr "Entrelacement"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 ppp"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2922
+#, fuzzy
+msgid "Black 1"
+msgstr "Noir"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
-msgstr "quatre passes"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Noir"
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 ppp"
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
-msgstr "Entrelancement 2"
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
-msgstr "huit passes"
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
+msgstr "Bac arrière"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Rapide (économique)"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
+msgstr "Bac avant"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Economique"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "Alimentation manuelle"
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Brouillon"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "Imprimer un CD"
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
-msgstr "Hauteur"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr "Alimentation rouleau (couper chaque page)"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Photo"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
+msgstr "Alimentation rouleau (sans découpe des pages)"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super Photo"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Alimentation rouleau"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra photo"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
+msgstr "Alimentation guide par feuille (arrière)"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr "Meilleur"
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+msgid "Manual Feed (Front)"
+msgstr "Alimentation manuelle (avant)"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr "Texte"
+#: src/xml/xmli18n-tmp.h:3104
+msgid "Photo Board"
+msgstr "Carte photo"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr "Graphiques"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr "Coupe papier Bin 1"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr "Texte et graphiques"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr "Coupe papier Bin 2"
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "Photographie"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
+msgstr "Sélection de coupe automatique"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Crayon"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr "Sélection manuelle"
 
-#: src/main/generic-options.c:55
-msgid "Page"
-msgstr "Page"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "Une couleur de base"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr "Travail"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
+msgstr "Trois couleurs de base"
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
-msgstr "Type d'image"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "Quatre couleurs de base"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
-msgstr "Type d'image à imprimer"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
+msgstr "Cinq couleurs de base"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
-msgstr "Mode de travail"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Six couleurs de base"
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
-msgstr "Mode Travail/Page"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Une couleur de base optimiseur de brillance"
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
-msgstr "Page numéro"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
+msgstr "Trois couleurs de base brillant"
 
-#: src/main/generic-options.c:81
-msgid "Page number"
-msgstr "Page numéro"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
+msgstr "Quatre couleurs de base brillant"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Six couleurs de base Optimiseur de brillance"
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Sept couleurs de base Optimiseur de brillance"
+
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "Défaut"
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Photo sept couleurs"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Six couleurs amélioré composite"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Sept couleurs de base"
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "EChelle de gris à deux niveaux"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "Deux couleurs de base"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr "Huit couleurs photo"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr "Huit couleurs de base"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Six couleurs photo"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
+msgstr "Entrelacement"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr "quatre passes"
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr "Entrelancement 2"
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr "huit passes"
+
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr "Actif"
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Paysage"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr "ArchA sens paysage"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr "ArchB sens paysage"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr "ArcgC sens paysage"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr "ArchD sens paysage"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr "ArchE sens paysage"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Foolscap américain"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Foolscap européen"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Quatro couronne large"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demi-quatro"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Quatro royal"
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Octave couronne"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Octave couronne large"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demi-octave"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Octave royale"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Petite reliure"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Petite reliure Penguin"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Grande reliure Penguin"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Carte Hagaki"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Carte Oufuku"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Enveloppe longue japonaise n°3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Enveloppe longue japonaise n°3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Enveloppe longue japonaise n°4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Enveloppe longue japonaise n°4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Enveloppe Monarch"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Enveloppe Monarch"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr "Carte"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr "Carte postale large"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "Rouleau 89mm"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "Rouleau 5 pouces"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "Rouleau 210mm"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "Rouleau 13 pouces"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "Rouleau 22 pouces"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "Rouleau 24 pouces"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "Rouleau 44 pouces"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "Rouleau 36 pouces"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "Rouleau 4 pouces"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr "Postscript level 1"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr "Postscript level 2"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr "Canon BJC-30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+#, fuzzy
+msgid "Canon PIXMA MP160"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:3800
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Epson E 150"
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/xml/xmli18n-tmp.h:3988
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
-msgstr "Epson Stylus Photo R800"
-
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3600"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+#, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate"
+
+#: src/xml/xmli18n-tmp.h:4096
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr "Canon CL 700"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Epson PX G900"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Epson PX V500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
-msgstr "Brother HL-4Ve"
-
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
-msgstr "Brother HL-10V"
-
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
-msgstr "Brother HL-10h"
-
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
-msgstr "Brother HL-630"
-
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
-msgstr "Brother HL-660"
-
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
-msgstr "Brother HL-760"
-
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
-msgstr "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4211
+#, fuzzy
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/xml/xmli18n-tmp.h:4212
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:4213
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:4214
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:4215
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:4218
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/xml/xmli18n-tmp.h:4219
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/xml/xmli18n-tmp.h:4220
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:4221
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:4222
+#, fuzzy
+msgid "Brother HL-1430"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4223
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4224
+#, fuzzy
+msgid "Brother HL-1450"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4225
+#, fuzzy
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4226
+#, fuzzy
+msgid "Brother HL-1650"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+#, fuzzy
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4229
+#, fuzzy
+msgid "Brother HL-1850"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4230
+#, fuzzy
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+#, fuzzy
+msgid "Brother HL-2460"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:4233
+#, fuzzy
+msgid "Brother HL-2460N"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:4235
+#, fuzzy
+msgid "Brother HL-5030"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4236
+#, fuzzy
+msgid "Brother HL-5040"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4237
+#, fuzzy
+msgid "Brother HL-5050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4238
+#, fuzzy
+msgid "Brother HL-5070N"
+msgstr "Brother HL-1070"
+
+#: src/xml/xmli18n-tmp.h:4239
+#, fuzzy
+msgid "Brother HL-5140"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4240
+#, fuzzy
+msgid "Brother HL-5150D"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4241
+#, fuzzy
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:4244
+#, fuzzy
+msgid "Brother HL-7050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4245
+#, fuzzy
+msgid "Brother HL-7050N"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4284
+#, fuzzy
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+#, fuzzy
+msgid "Gestetner MP 5000"
+msgstr "Epson MC 5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5500"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4O"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+#, fuzzy
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1120"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+#, fuzzy
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+#, fuzzy
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2100"
+
+#: src/xml/xmli18n-tmp.h:4534
+#, fuzzy
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 1120"
+
+#: src/xml/xmli18n-tmp.h:4535
+#, fuzzy
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2300"
+
+#: src/xml/xmli18n-tmp.h:4536
+#, fuzzy
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:4537
+#, fuzzy
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4538
+#, fuzzy
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4539
+#, fuzzy
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4540
+#, fuzzy
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:4541
+#, fuzzy
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+#, fuzzy
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4551
+#, fuzzy
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4552
+#, fuzzy
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+#, fuzzy
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4200"
+
+#: src/xml/xmli18n-tmp.h:4558
+#, fuzzy
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+#, fuzzy
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4561
+#, fuzzy
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+#, fuzzy
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4565
+#, fuzzy
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+#, fuzzy
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9000"
+
+#: src/xml/xmli18n-tmp.h:4571
+#, fuzzy
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4572
+#, fuzzy
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4573
+#, fuzzy
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4574
+#, fuzzy
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4575
+#, fuzzy
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4576
+#, fuzzy
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4577
+#, fuzzy
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4578
+#, fuzzy
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4579
+#, fuzzy
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:4580
+#, fuzzy
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:4581
+#, fuzzy
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4582
+#, fuzzy
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+#, fuzzy
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4664
+#, fuzzy
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+#, fuzzy
+msgid "Infotec IS2035"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4670
+#, fuzzy
+msgid "Infotec IS2045"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+#, fuzzy
+msgid "Infotec IS2105"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4673
+#, fuzzy
+msgid "Infotec IS 2015"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4674
+#, fuzzy
+msgid "Infotec IS 2018"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+#, fuzzy
+msgid "Infotec IS 2060"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4677
+#, fuzzy
+msgid "Infotec IS 2075"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4678
+#, fuzzy
+msgid "Infotec IS 2122"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4679
+#, fuzzy
+msgid "Infotec IS 2127"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4680
+#, fuzzy
+msgid "Infotec IS 2132"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4681
+#, fuzzy
+msgid "Infotec IS 2135"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4682
+#, fuzzy
+msgid "Infotec IS 2145"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4683
+#, fuzzy
+msgid "Infotec IS 2151"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4684
+#, fuzzy
+msgid "Infotec IS 2160"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4685
+#, fuzzy
+msgid "Infotec IS 2175"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4686
+#, fuzzy
+msgid "Infotec IS 2215"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4687
+#, fuzzy
+msgid "Infotec IS 2216"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4688
+#, fuzzy
+msgid "Infotec IS 2220"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+#, fuzzy
+msgid "Infotec IS 2225"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4691
+#, fuzzy
+msgid "Infotec IS 2230"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4692
+#, fuzzy
+msgid "Infotec IS 2235"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4693
+#, fuzzy
+msgid "Infotec IS 2245"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4694
+#, fuzzy
+msgid "Infotec IS 2255"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4695
+#, fuzzy
+msgid "Infotec IS 2265"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4696
+#, fuzzy
+msgid "Infotec IS 2275"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4697
+#, fuzzy
+msgid "Infotec IS 2316"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4698
+#, fuzzy
+msgid "Infotec IS 2320"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4699
+#, fuzzy
+msgid "Infotec IS 2325"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4700
+#, fuzzy
+msgid "Infotec IS 2416"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4701
+#, fuzzy
+msgid "Infotec IS 2425"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4702
+#, fuzzy
+msgid "Infotec IS 2430"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4703
+#, fuzzy
+msgid "Infotec IS 2435"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4704
+#, fuzzy
+msgid "Infotec IS 2445"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4705
+#, fuzzy
+msgid "Infotec IS 3090"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4706
+#, fuzzy
+msgid "Infotec IS 3110"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4707
+#, fuzzy
+msgid "Infotec IS 3135"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4708
+#, fuzzy
+msgid "Infotec MP 2550"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+#, fuzzy
+msgid "Infotec MP 3350"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+#, fuzzy
+msgid "Infotec MP 4000"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+#, fuzzy
+msgid "Infotec MP 5000"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
-msgstr "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-#, fuzzy
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
-msgstr "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
-msgstr "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
-msgstr "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
-msgstr "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
-msgstr "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
-msgstr "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
-msgstr "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
-msgstr "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
-msgstr "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
-msgstr "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
-msgstr "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
-msgstr "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
-msgstr "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
-msgstr "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
-msgstr "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
-msgstr "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
-msgstr "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
-msgstr "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
-msgstr "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
-msgstr "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
-msgstr "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
-msgstr "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+#, fuzzy
+msgid "Lanier MP 1100"
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
-msgstr "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+#, fuzzy
+msgid "Lanier LD1100"
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
-msgstr "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
-msgstr "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
-msgstr "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
-msgstr "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
-msgstr "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
-msgstr "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
-msgstr "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
-msgstr "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
-msgstr "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
-msgstr "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
-msgstr "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
-msgstr "\"Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
-msgstr "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
-msgstr "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
-msgstr "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
-msgstr "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
-msgstr "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
-msgstr "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+#, fuzzy
+msgid "Lanier MP 3350"
+msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
-msgstr "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
-msgstr "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4820
 #, fuzzy
-msgid "Sharp AR-M257"
-msgstr "Sharp AR-161"
+msgid "Lanier MP 4000"
+msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
-msgstr "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
-msgstr "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
-msgstr "Star LaserPrinter 8"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
-msgstr "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
-msgstr "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
-msgstr "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4826
+#, fuzzy
+msgid "Lanier MP 5000"
+msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
-msgstr "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
-msgstr "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
-msgstr "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
-msgstr "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
-msgstr "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
+#: src/xml/xmli18n-tmp.h:4834
 #, fuzzy
-msgid "Xerox WorkCentre M118"
-msgstr "Xerox Document Centre 400"
+msgid "Lanier MP 9000"
+msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
+
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
+
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
+
+#: src/xml/xmli18n-tmp.h:4839
 #, fuzzy
-msgid "Lexmark X73"
-msgstr "Lexmark Z43"
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4840
+#, fuzzy
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4841
+#, fuzzy
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
-msgstr "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
-msgstr "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
-msgstr "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
-msgstr "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
-msgstr "Olympus P-3000"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
-msgstr "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
-msgstr "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
-msgstr "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
-msgstr "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:1021
-#, fuzzy
-msgid "Olympus P-S100"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:1022
-#, fuzzy
-msgid "Canon CP-10"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
-msgstr "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
-msgstr "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
-msgstr "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
-msgstr "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-#, fuzzy
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-#, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-#, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-#, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-#, fuzzy
-msgid "Sony DPP-EX5"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-#, fuzzy
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-#, fuzzy
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
-msgstr "Données brutes (raw) 16 bits"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
-msgstr "Données brutes (raw) 8 bits"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
-msgstr "Type de courbe"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "Courbe linéaire, interpolée ou libre"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "Minimum X"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
-msgstr "Valeur minimum possible pour X"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "Maximum X"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
-msgstr "Valeur maximum possible pour X"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
-msgstr "Valeur minimum possible pour Y"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
-msgstr "Valeur maximum possible pour Y"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "Valeur gamma"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Pouce"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Défini l'unité de base de mesure en pouce"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Défini l'unité de base de mesure en centimètres"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
-msgstr "Points"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Défini l'unité de base de mesure en points (1/72\")"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "mm"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Défini l'unité de base de mesure en millimètres"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "Pica"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Défini l'unité de base de mesure en pica (1/72\")"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Sortie couleur"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "Commande standard"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "Utiliser la commande d'impression standard"
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "Commande personnalisée"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "Utiliser une commande personnalisée"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Fichier"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "Imprimer dans un fichier"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
-msgstr "Editer la courbe..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
-msgstr "Valeurs par défaut"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
-msgstr "Valeurs précédentes"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "Valider"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Annuler"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Configurer l'imprimante..."
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-#, fuzzy
-msgid "Reset"
-msgstr "Meilleur"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Print v%s"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "À propos"
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
 msgstr ""
-"Imprimer et enregistrer\n"
-"les réglages"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
-"Enregistrer\n"
-"les réglages"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Imprimer"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Aperçu"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
 msgstr ""
-"Positionnement de l'image sur la page.\n"
-"Cliquez et Glissez avec le premier bouton pour positionner l'image sur la "
-"page.\n"
-"Cliquez et Glissez avec le second bouton pour déplacer l'image avec "
-"précision, chaque unité de mouvement déplace l'image d'un point (1/72\")\n"
-"Cliquez et Glissez avec le troisième (milieu) bouton pour déplacer l'image "
-"en unités de taille d'image.\n"
-"Maintenir la touche Maj enfoncée en Cliquant et Glissant contraint l'image à "
-"se déplacer horizontalement ou verticalement.\n"
-"Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
-"retournera à sa position de départ."
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "Taille du papier"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "Afficher tout les formats"
+#: src/xml/xmli18n-tmp.h:4929
+#, fuzzy
+msgid "Oki OL400"
+msgstr "Okidata OL400"
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Dimensions :"
+#: src/xml/xmli18n-tmp.h:4930
+#, fuzzy
+msgid "Oki OL400e"
+msgstr "Okidata OL400e"
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Largeur :"
+#: src/xml/xmli18n-tmp.h:4931
+#, fuzzy
+msgid "Oki OL400ex"
+msgstr "Okidata OL400ex"
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
+#: src/xml/xmli18n-tmp.h:4932
+#, fuzzy
+msgid "Oki OL410e"
+msgstr "Okidata OL410e"
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Hauteur :"
+#: src/xml/xmli18n-tmp.h:4933
+#, fuzzy
+msgid "Oki OL600e"
+msgstr "Okidata OL600e"
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
+#: src/xml/xmli18n-tmp.h:4934
+#, fuzzy
+msgid "Oki OL610e/S"
+msgstr "Okidata OL610e/S"
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
-msgstr "Taille papier automatique"
+#: src/xml/xmli18n-tmp.h:4935
+#, fuzzy
+msgid "Oki OL800"
+msgstr "Okidata OL800"
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "Nombre d'exemplaires"
+#: src/xml/xmli18n-tmp.h:4936
+#, fuzzy
+msgid "Oki OL810ex"
+msgstr "Okidata OL810ex"
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Choisir le nombre d'exemplaires à imprimer, entre 1 et 100"
+#: src/xml/xmli18n-tmp.h:4937
+#, fuzzy
+msgid "Oki Okipage 6e"
+msgstr "Okidata Okipage 6e"
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "Position de l'image"
+#: src/xml/xmli18n-tmp.h:4938
+#, fuzzy
+msgid "Oki Okipage 6ex"
+msgstr "Okidata Okipage 6ex"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Auto"
+#: src/xml/xmli18n-tmp.h:4939
+#, fuzzy
+msgid "Oki Okipage 8p"
+msgstr "Okidata Okipage 8p"
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Portrait"
+#: src/xml/xmli18n-tmp.h:4940
+#, fuzzy
+msgid "Oki Okipage 10e"
+msgstr "Okidata Okipage 10e"
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Paysage"
+#: src/xml/xmli18n-tmp.h:4941
+#, fuzzy
+msgid "Oki Okipage 10ex"
+msgstr "Okidata Okipage 10ex"
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Retourné (haut/bas)"
+#: src/xml/xmli18n-tmp.h:4942
+#, fuzzy
+msgid "Oki Okipage 14ex"
+msgstr "Okidata Okipage 14ex"
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Paysage retourné (haut/bas)"
+#: src/xml/xmli18n-tmp.h:4943
+#, fuzzy
+msgid "Oki Super 6e"
+msgstr "Okidata Super 6e"
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr ""
-"Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné "
-"(retourné haut/bas)"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientation :"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Gauche:"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Distance entre le bord gauche du papier et l'image"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Droite:"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Distance entre le bord gauche du papier et le bord droit de l'image"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Distance entre le bord droit du papier et l'image"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Haut:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Distance entre le bord supérieur du papier et l'image"
+#: src/xml/xmli18n-tmp.h:4952
+#, fuzzy
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Bas :"
+#: src/xml/xmli18n-tmp.h:4953
+#, fuzzy
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr ""
-"Distance entre le bord supérieur du papier et le bord inférieur de l'image"
+#: src/xml/xmli18n-tmp.h:4954
+#, fuzzy
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Distance entre le bord inférieur du papier et l'image"
+#: src/xml/xmli18n-tmp.h:4955
+#, fuzzy
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centrer:"
+#: src/xml/xmli18n-tmp.h:4956
+#, fuzzy
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "Horizontalement"
+#: src/xml/xmli18n-tmp.h:4957
+#, fuzzy
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centrer l'image horizontalement sur le papier"
+#: src/xml/xmli18n-tmp.h:4958
+#, fuzzy
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Les deux"
+#: src/xml/xmli18n-tmp.h:4959
+#, fuzzy
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centrer l'image sur le papier"
+#: src/xml/xmli18n-tmp.h:4960
+#, fuzzy
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "Verticalement"
+#: src/xml/xmli18n-tmp.h:4961
+#, fuzzy
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centrer l'image verticalement sur le papier"
+#: src/xml/xmli18n-tmp.h:4962
+#, fuzzy
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Configuration de l'imprimante"
+#: src/xml/xmli18n-tmp.h:4963
+#, fuzzy
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
-msgstr "Marque de l'imprimante :"
+#: src/xml/xmli18n-tmp.h:4964
+#, fuzzy
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
-msgstr "Sélectionnez la marque de votre imprimante"
+#: src/xml/xmli18n-tmp.h:4965
+#, fuzzy
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Modèle d'imprimante :"
+#: src/xml/xmli18n-tmp.h:4966
+#, fuzzy
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Sélectionnez le modèle de votre imprimante"
+#: src/xml/xmli18n-tmp.h:4967
+#, fuzzy
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "Fichier PPD:"
+#: src/xml/xmli18n-tmp.h:4968
+#, fuzzy
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Entrez le nom de fichier PPD pour votre imprimante"
+#: src/xml/xmli18n-tmp.h:4969
+#, fuzzy
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Parcourir"
+#: src/xml/xmli18n-tmp.h:4970
+#, fuzzy
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Choisissez le fichier PPD correct pour votre imprimante"
+#: src/xml/xmli18n-tmp.h:4971
+#, fuzzy
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr ""
-"Sélectionnez le nom de la file d'attente (pas le type ni le modèle "
-"d'imprimante) que vous voulez utiliser pour l'impression"
+#: src/xml/xmli18n-tmp.h:4972
+#, fuzzy
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "File d'attente:"
+#: src/xml/xmli18n-tmp.h:4973
+#, fuzzy
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "Entrez la commande pour imprimer sur votre imprimante"
+#: src/xml/xmli18n-tmp.h:4974
+#, fuzzy
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "Entrez le nom du fichier."
+#: src/xml/xmli18n-tmp.h:4975
+#, fuzzy
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
-msgstr "fichier d'impression"
+#: src/xml/xmli18n-tmp.h:4976
+#, fuzzy
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "Imprimer dans un fichier ?"
+#: src/xml/xmli18n-tmp.h:4977
+#, fuzzy
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Définir une nouvelle imprimante"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Nom de l'imprimante :"
+#: src/xml/xmli18n-tmp.h:4979
+#, fuzzy
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique"
+#: src/xml/xmli18n-tmp.h:4980
+#, fuzzy
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "À propos de Gutenprint"
+#: src/xml/xmli18n-tmp.h:4981
+#, fuzzy
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Version de Gutenprint"
+#: src/xml/xmli18n-tmp.h:4982
+#, fuzzy
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Paramètres de l'imprimante"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr ""
-"Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
-"voulez utiliser pour l'impression"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Configurer l'imprimante..."
+#: src/xml/xmli18n-tmp.h:4985
+#, fuzzy
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr ""
-"Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
-"pour l'impression sur cette imprimante"
+#: src/xml/xmli18n-tmp.h:4986
+#, fuzzy
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Nouvelle imprimante..."
+#: src/xml/xmli18n-tmp.h:4987
+#, fuzzy
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
-msgstr ""
-"Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un "
-"ensemble de réglage que vous souhaitez réutiliser plus tard."
+#: src/xml/xmli18n-tmp.h:4988
+#, fuzzy
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2123
+#: src/xml/xmli18n-tmp.h:4989
 #, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Valeurs par défaut"
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4990
+#, fuzzy
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "Taille de l'image"
+#: src/xml/xmli18n-tmp.h:4991
+#, fuzzy
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Échelle:"
+#: src/xml/xmli18n-tmp.h:4992
+#, fuzzy
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Régler l'échelle (taille) de l'image"
+#: src/xml/xmli18n-tmp.h:4993
+#, fuzzy
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Mise à l'échelle en "
+#: src/xml/xmli18n-tmp.h:4994
+#, fuzzy
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr ""
-"Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page "
-"ou en nombre de points par pouces"
+#: src/xml/xmli18n-tmp.h:4995
+#, fuzzy
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Pourcentage"
+#: src/xml/xmli18n-tmp.h:4996
+#, fuzzy
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Dimensionne l'impression par rapport à la taille de la page"
+#: src/xml/xmli18n-tmp.h:4997
+#, fuzzy
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "points par pouce"
+#: src/xml/xmli18n-tmp.h:4998
+#, fuzzy
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Dimensionne l'impression en nombre de points par pouce"
+#: src/xml/xmli18n-tmp.h:4999
+#, fuzzy
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Défini la largeur de l'impression"
+#: src/xml/xmli18n-tmp.h:5000
+#, fuzzy
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Défini la hauteur de l'impression"
+#: src/xml/xmli18n-tmp.h:5001
+#, fuzzy
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr ""
-"Utiliser la taille \n"
-"de l'image originale"
+#: src/xml/xmli18n-tmp.h:5002
+#, fuzzy
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Utiliser la taille de l'image comme taille d'impression"
+#: src/xml/xmli18n-tmp.h:5003
+#, fuzzy
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Ajustement des couleurs d'impression"
+#: src/xml/xmli18n-tmp.h:5004
+#, fuzzy
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Valeurs par défaut"
+#: src/xml/xmli18n-tmp.h:5005
+#, fuzzy
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Fermer"
+#: src/xml/xmli18n-tmp.h:5006
+#, fuzzy
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Aperçu de l'image"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
-msgstr "Visualisation canaux de sortie"
+#: src/xml/xmli18n-tmp.h:5008
+#, fuzzy
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
-msgstr "Sortie"
+#: src/xml/xmli18n-tmp.h:5009
+#, fuzzy
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Type de sortie:"
+#: src/xml/xmli18n-tmp.h:5010
+#, fuzzy
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Sélectionnez le type de sortie désiré"
+#: src/xml/xmli18n-tmp.h:5011
+#, fuzzy
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Réglages fins..."
+#: src/xml/xmli18n-tmp.h:5012
+#, fuzzy
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr ""
-"Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
-"algorithme de tramage"
+#: src/xml/xmli18n-tmp.h:5013
+#, fuzzy
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-7050"
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "Unités de taille:"
+#: src/xml/xmli18n-tmp.h:5014
+#, fuzzy
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
-msgstr " "
+#: src/xml/xmli18n-tmp.h:5015
+#, fuzzy
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Unités:"
+#: src/xml/xmli18n-tmp.h:5016
+#, fuzzy
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Sélectionne l'unité de base de mesure pour l'impression"
+#: src/xml/xmli18n-tmp.h:5017
+#, fuzzy
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:5018
+#, fuzzy
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:5019
+#, fuzzy
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5020
+#, fuzzy
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-7050"
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5021
+#, fuzzy
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-7050"
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5022
+#, fuzzy
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5023
+#, fuzzy
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "Imprimante"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(imprimante par défaut)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr "\"Samsung ML-6000"
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "Caractéristiques de l'imprimante"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
-msgstr "contrôle de sortie"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
 
-#: src/cups/genppd.c:151
-msgid "Common"
-msgstr "Commun"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
-msgstr "Extra1"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
-msgstr "Extra2"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
-msgstr "Extra3"
+#: src/xml/xmli18n-tmp.h:5032
+#, fuzzy
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7000"
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
-msgstr "Extra4"
+#: src/xml/xmli18n-tmp.h:5033
+#, fuzzy
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7000N"
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
-msgstr "Extra5"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
 
-#. 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:1064
-msgid "English"
-msgstr "French"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr ""
 
-#: src/cups/genppd.c:1647
+#: src/xml/xmli18n-tmp.h:5043
 #, fuzzy
-msgid "2-Sided Printing"
-msgstr "Impression double face"
+msgid "Savin 2560"
+msgstr "Canon S450"
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5046
+#, fuzzy
+msgid "Savin 40105"
+msgstr "Raven LP-410"
+
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "Non"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "Oui"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5061
 #, fuzzy
-msgid "Value"
-msgstr "Bleu"
+msgid "Savin 4060"
+msgstr "Canon S400"
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
-msgstr "Réglage fin"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Version d'escputil"
+#: src/xml/xmli18n-tmp.h:5063
+#, fuzzy
+msgid "Savin 4090"
+msgstr "Canon S400"
 
-#: 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"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
 msgstr ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Ce programme est un logiciel libre, vous pouvez le redistribuer et/ou le "
-"modifier\n"
-"sous les termes de la licence GNU GPL General Public License telle que "
-"publiée\n"
-"par la Free Software Foundation, soit la version 2 de la licence, ou (à "
-"votre choix)\n"
-"toute version ultérieure.\n"
-"\n"
-"Ce programme est distribuée dans l'espoir qu'il sera utile, mais SANS\n"
-"GARANTIE; sans même la garantie impliquée par la COMMERCIALISATION \n"
-"ou l'ACCORD POUR UN USAGE PARTICULIER. Voyez la licence GNU General Public "
-"License\n"
-"pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la GNU General Public License fournie\n"
-"avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:119
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5066
 #, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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"
+msgid "Savin 8020"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
 msgstr ""
-"Utilisation : escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                       [-P imprimante | -r périphérique] [-u] [-q] [-m "
-"modèle] [ -S ]\n"
-"Effectue des opérations de maintenance sur les imprimantes EPSON Stylus "
-"(R).\n"
-"Exemples : escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\n"
-"Commandes :\n"
-"   -c|--clean-head    Nettoie la tête d'impression\n"
-"   -n|--nozzle-check  Imprime un motif de test des buses.\n"
-"                      Les buses sales ou bouchées apparaîtront comme des\n"
-"                      trous dans le motif. Si vous en voyez vous devrier "
-"nettoyer \n"
-"                      tête d'impression.\n"
-"   -a|--align-head    Aligne la tête d'impression. ATTENTION : une mauvaise\n"
-"                      utilisation de cette fonction peut provoquer une "
-"mauvaise\n"
-"                      qualité d'impression et/ou endommager l'imprimante.\n"
-"   -s|--status        Indique le statut de l'imprimante.\n"
-"   -i|--ink-level     Récupère le niveau d'encre de l'imprimante. Cela "
-"nécessite\n"
-"                      un accés en lecture/écriture sur le périphérique \n"
-"                      en mode caractère (raw).\n"
-"  -e|--extended-ink-info    Récupère les informations complémentaires \n"
-"                      sur les encres. Cette commande nécessite\n"
-"                      un accés en lecture/écriture sur le périphérique \n"
-"                      en mode caractère (raw).\n"
-"   -d|--identify      Demande à l'imprimante des renseignements sur la "
-"marque\n"
-"                      et le modèle. Cela nécessite un accés en lecture/"
-"écriture\n"
-"                      sur le périphérique en mode caractère (raw) .\n"
-"   -l|--license       Affiche la licence de ce programme.\n"
-"   -M|--list-models   Affiche les modèles d'imprimante supportés.\n"
-"   -h|--help          Affiche ce message d'aide.\n"
-" \n"
-"Options :\n"
-"   -P|--printer-name  Indique le nom de la file d'attente d'impression à \n"
-"                      utiliser. Par défaut, utilisation de l'imprimante du \n"
-"                      par défaut du système.\n"
-"   -r|--raw-device    Indique le nom d'un périphérique sur lequel écrire \n"
-"                      directement au lieu d'utiliser une file d'attente \n"
-"                      pour l'impression.\n"
-"   -u|--new           L'imprimante est une imprimante récente (Stylus Color "
-"740\n"
-"                      ou plus récent). Utile uniquement si le périphérique \n"
-"                      n'est pas en mode caractère (raw).   -q|--"
-"quiet         N'affiche pas la bannière.\n"
-"   -S|--short-name    Affiche le nom court de l'imprimante avec --identify.\n"
-"   -m|--model         Indique le modèle précis pour l'alignement des têtes.\n"
-"   -C|--choices       Nombre de choix de motifs pour l'alignement\n"
-"   -p|--patterns      Numéro des jeux de motifs pour l'alignment\n"
 
-#: src/escputil/escputil.c: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"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
-"Usage: escputil [OPTIONS] [COMMANDE]\n"
-"Usage: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model]\n"
-"Maintenance sur les imprimantes EPSON Stylus (R).\n"
-"Exemples: escputil -c -P stpex-on-third-floor\n"
-"          escputil -i -u -r /dev/lp0\n"
-"\n"
-"  Commandes:\n"
-"    -c Nettoie la tête d'impression.\n"
-"    -n Imprime une trame de test des buses.\n"
-"          Des buses sales ou bouchées se verront comme des espaces dans la\n"
-"          trame. Si vous voyez un quelconque espace, vous devriez nettoyer\n"
-"          la tête d'impression.\n"
-"    -a Alignement de la tête d'impression.  ATTENTION: une mauvaise "
-"utilisation de cet\n"
-"          utilitaire peut conduire à une piètre qualité d'impression et/ou\n"
-"          endommager l'imprimante.\n"
-"    -o Alignement des têtes d'impression couleur (Stylus Color 480 and 580\n"
-"          seulement).  ATTENTION: une mauvaise utilisation de cet utilitaire "
-"peut\n"
-"          conduire à une piètre qualité d'impression et/ou endommager "
-"l'imprimante.\n"
-"    -s Retrouver le status de l'imprimante.\n"
-"    -i Obtenir le niveau d'encre de l'imprimante.  Ceci nécessite\n"
-"          un accès en lecture/écriture au périphérique d'entrée.\n"
-"    -d Interroge l'imprimante sur la marque et le modèle de l'imprimante."
-"Ceci nécessite\n"
-"          un accès en lecture/écriture au périphérique d'entrée.  \n"
-"    -l Affiche les termes de licence/garantie de ce programme.\n"
-"    -M Liste les modèles d'imprimantes disponibles.\n"
-"    -h Imprime ce message d'aide.\n"
-"  Options:\n"
-"    -P Spécifie le nom de la queue d'imprimante sur laquelle opérer.\n"
-"          Par déaut l'imprimante système.\n"
-"    -r Spécifie le nom du périphérique sur lequel écrire directement\n"
-"          plutôt que de passer via une queue d'impression.\n"
-"    -u L'imprimante est une nouvelle imprimante (Stylus Color 740 ou plus "
-"récente).\n"
-"    -q Supprime la bannière.\n"
-"    -m Spécifie le modèle précis pour l'alignement des têtes.\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Vous ne pouvez spécifier qu'une imprimante ou périphérique"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
+#: src/xml/xmli18n-tmp.h:5070
+#, fuzzy
+msgid "Savin 8030"
+msgstr "Canon S800"
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
-msgstr "Le choix de l'alignement doit être au moins 1."
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
-msgstr "Le nombre de passes d'alignement doit être au moins de 1."
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
+msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Option inconnue %c\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
+msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
-msgstr "Tapez `%s --help' pour plus d'information.\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
+msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
-msgstr "Tapez  `%s -h' pour plus d'information.\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
+msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Impossible d'ouvrir le périphérique %s : %s\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Impossible d'envoyer la commande à l'imprimante\n"
+#: src/xml/xmli18n-tmp.h:5079
+#, fuzzy
+msgid "Savin 8065"
+msgstr "Canon BJC-85"
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
-msgstr "Lecture données de l'imprimante: temps excédé\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
+msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Impossible de lire à partir de %s : %s\n"
+#: src/xml/xmli18n-tmp.h:5081
+#, fuzzy
+msgid "Savin 8090"
+msgstr "Canon S800"
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Option inconnue %c\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Impossible d'écrire sur %s : %s\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
-"\n"
-"Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
-"\n"
-"Impossible de détecter le type de l'imprimante.\n"
-"Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "Inconnu"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
+msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
-msgstr "Etat: Erreur\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
-msgstr "Etat: auto-impression\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
-msgstr "Etat: occupé\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
+msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
-msgstr "Etat: Attente\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
-msgstr "Etat: Libre\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
+msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr "Etat: Pause\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
-msgstr "Etat: Nettoyage\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
-msgstr "Etat: Configuration usine\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr "Etat: Arrêt en cours\n"
+#: src/xml/xmli18n-tmp.h:5097
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
-msgstr "Etat: Inconnu (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
-msgstr "Erreur: Erreur fatale\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr "Star LS-04"
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
-msgstr "Erreur: une autre interface est sélectionnée\n"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
-msgstr "Erreur: ouvercle ouvert\n"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
+msgstr "Tally MT908"
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
-msgstr "Erreur: Bourrage papier\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
-msgstr "Erreur: plus d'encre\n"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
-msgstr "Erreur: Pas de papier\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
-msgstr "Erreur: Attente retour à la position de repos\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
-msgstr "Erreur: double chargement\n"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
-msgstr "Erreur: Erreur massicot non récupérable\n"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
-msgstr "Erreur: bourrage massicot (récupérable)\n"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
-msgstr "Erreur: Support CD sorti\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
-msgstr "Erreur: Chargement de la carte\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
-msgstr "Erreur: couvercle du support ouvert\n"
+#: src/xml/xmli18n-tmp.h:5111
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
-msgstr "Error: Inconnue (%d)\n"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
+msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
-msgstr "Impression autotest des buses\n"
+#: src/xml/xmli18n-tmp.h:5113
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
-msgstr "Niveau d'encres:\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Encre couleur"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Pourcentage restant"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
-msgstr "Attention: Encre noire niveau bas\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
-msgstr "Attention: Inconnu (%d)\n"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
-msgstr "Nom du travail: "
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
-msgstr "niveau d'encres"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "état"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr ""
-"Obtenir %s demande d'utiliser un périphérique en mode caractère (raw "
-"device).\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr ""
-"Obtenir les niveaux d'encre demande d'utiliser un périphérique en mode "
-"caractère (raw device)\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr "Olympus P-3000"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
-msgstr "Numéro de pièce"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "Date"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr ""
-"L'identification de l'imprimante demande d'utiliser un périphérique "
-"caractère (raw devive)\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
+#: src/xml/xmli18n-tmp.h:5128
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Nettoyage des têtes...\n"
+#: src/xml/xmli18n-tmp.h:5129
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr ""
-"Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
-"dans l'imprimante\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:1732
-#, 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 ""
-"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
-"\n"
-"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
-"imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
-"utilitaire\n"
-"peut dégrader la qualité d'impression de votre imprimante et endommager "
-"votre\n"
-"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
-"n'offre\n"
-"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
-"\n"
-"Cet utilitaire imprime %d trames de test. Chaque trame apparait très "
-"similaire.\n"
-"Les trames sont constituées d'une série de paire de lignes verticales qui "
-"se\n"
-"superposent. Sous chaque paire de lignes il y a un nombre compris entre %d "
-"et %d.\n"
-"\n"
-"Quand vous inspectez les paires de lignes, vous devriez trouver la paire "
-"de \n"
-"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
-"simple ligne verticale. Inspectez les paires avec tout votre attention pour\n"
-"trouver la meilleure. Utilisez une loupe ou un verre grossisseur et "
-"recommandé\n"
-"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
-"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
-"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
-"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
-"dans\n"
-"le chargeur avant de le taper.\n"
-"\n"
-"Chaque trame est similaire, mais les dernières trames utilisent des points \n"
-"plus fins pour un alignement plus critique. Vous devez lancer toutes les\n"
-"passes pour aligner corectement votre imprimante. Après avoir lancé toutes \n"
-"les passes, la trame d'alignement va être imprimée encore une fois. Vous\n"
-"devriez trouver que la paire la plus au milieu (#%d en dehors de %d) est\n"
-"la meilleure pour toute les trames.\n"
-"\n"
-"Après que les passes seront imprimées encore une fois, vous devrez choisir\n"
-"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
-"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
-"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
-"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
-"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
-"durant cette opération.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
 
-#: src/escputil/escputil.c:1767
-#, 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 ""
-"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
-"\n"
-"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
-"imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
-"utilitaire\n"
-"peut dégrader la qualité d'impression de votre imprimante et endommager "
-"votre\n"
-"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
-"n'offre\n"
-"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
-"\n"
-"Cet utilitaire imprime une trame de test.constituée d'une série de paire "
-"de \n"
-"lignes verticales qui se superposent. Sous chaque paire de lignes il y a \n"
-"un nombre compris entre %d et %d.\n"
-"\n"
-"Quand vous inspectez les paires de lignes, vous devriez trouver la paire "
-"de \n"
-"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
-"simple ligne verticale. Inspectez les paires avec tout votre attention pour\n"
-"trouver la meilleure. Utilisez une loupe ou un verre grossisseur et "
-"recommandé\n"
-"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
-"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
-"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
-"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
-"dans\n"
-"le chargeur avant de le taper.\n"
-"\n"
-"Après avoir lancé la trame d'alignement, elle va être imprimée encore une "
-"fois.\n"
-"Vous devriez trouver que la paire la plus au milieu (#%d en dehors de %d)\n"
-"est la meilleure pour toute les trames. Ensuite vous devrez choisir\n"
-"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
-"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
-"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
-"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
-"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
-"durant cette opération.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
-msgstr "uitte.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
 
-#: src/escputil/escputil.c:1828
-#, 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 ""
-"S'il vous plait inspectez la sortie finale avec attention pour vous\n"
-"assurez que votre imprimante est correctement alignée. Vous\n"
-"pouvez maintenant :\n"
-"  (s)auvegarder les rsulats dans votre imprimante\n"
-"  (q)uitter sans enregistrer les résultats, ou\n"
-"  (r)épéter entièrement l'opération depuis le début.\n"
-"Il vous sera ensuite demandé de confirmer votre choix\n"
-"Que voulez-vous faire (s, q, r) ?\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
-msgstr ""
-"Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
-"enregistrer :\n"
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
 
-#: src/escputil/escputil.c:1850
-#, 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 ""
-"OK, votre imprimante est alignée, mais l'alignement n'a pas été enregistré.\n"
-"Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
-"opération.\n"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr ""
-"S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
-"reprendre l'opération d'alignement.\n"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Répétition de l'opération d'alignement.\n"
+#: src/xml/xmli18n-tmp.h:5140
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/escputil/escputil.c:1871
-#, 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 ""
-"Ceci va altérer la configuration de votre imprimante.\n"
-"ATTENTION cette opération n'a pas été approuvée par EPSON Seikp\n"
-"et elle peut endommager votre imprimante; Procéder ?\n"
-"Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
-"enregistrer les réglages de votre imprimante.\n"
+#: src/xml/xmli18n-tmp.h:5141
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "À propos de l'enregistrement des réglages..."
+#: src/xml/xmli18n-tmp.h:5142
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "Échec !\n"
+#: src/xml/xmli18n-tmp.h:5143
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5144
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/xml/xmli18n-tmp.h:5145
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:5146
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:5147
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
 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:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "Succès !\n"
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
+#: src/xml/xmli18n-tmp.h:5150
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Commande non reconnue.\n"
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "La dernière commande n'a pas été confirmée.\n"
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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 ""
-"Cette opération prend en compte que votre imprimante est une Epson %s.\n"
-"Si ce n'est pas votre modèle d'imprimante, s'il vous plait tapez Control-C\n"
-"et choisissez votre modèle actuel d'imprimante.\n"
-"\n"
-"S'il vous plait placez une feuillle de papier dans votre imprimante\n"
-"pour commencer l'opération d'ailgnement des têtes.\n"
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Pressez Entrée pour continuer > "
+#: src/xml/xmli18n-tmp.h:5154
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
-"S'il vous plait inspectez l'impression et choisissez la meilleure paire de "
-"lignes dans chaque trame.\n"
-"Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Passe #%d"
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Veuillez insérer une feuille de papier vierge.\n"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr "Données brutes (raw) 16 bits"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Nombre hors-intervalle !\n"
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr "Données brutes (raw) 8 bits"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Je ne comprends pas ce que vous avez tapé !\n"
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n"
+#~ msgid "Adjust dot size as necessary"
+#~ msgstr "Ajuster la taille des gouttes si nécessaire"
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Tentative de réglage de l'alignement..."
+#~ msgid "Adjust dot size as necessary to achieve desired density"
+#~ msgstr ""
+#~ "Ajuster la taille des gouttes si nécessaire pour obtenir la densité "
+#~ "souhaitée"
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "Succès.\n"
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Trois niveaux de gris"
 
-#: src/escputil/escputil.c:2046
-#, 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 ""
-"S'il vous plait vérifiez que l'alignement est correct. après que la trame\n"
-"d'alignement soit imprimée à nouveau, assurez-vous que la meilleure\n"
-"trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n"
-"devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Sept couleurs amélioré"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Erreur en entrée\n"
+#~ msgid "720 x 720 DPI"
+#~ msgstr "720 x 720 ppp"
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Impression en cours..."
+#~ msgid "2880 x 1440 DPI Transposed"
+#~ msgstr "2880 x 1440 ppp transposé"
+
+#~ msgid "ISO A4"
+#~ msgstr "ISO A4"
+
+#~ msgid "ISO A5"
+#~ msgstr "ISO A5"
 
 #~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 #~ msgstr ""
@@ -8561,9 +12792,6 @@ msgstr "Impression en cours..."
 #~ msgid "High Gloss Film"
 #~ msgstr "Film très brillant"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Papier brillant qualité photo"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Cartes brillantes qualité photo"
 
@@ -8579,9 +12807,6 @@ msgstr "Impression en cours..."
 #~ msgid "CMYK Color"
 #~ msgstr "Couleur CMJN"
 
-#~ msgid "CMY Color"
-#~ msgstr "Couleur CMJ"
-
 #~ msgid "<Image>/File/Print..."
 #~ msgstr "<Image>/Fichier/Imprimer..."
 
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 02c38f7..b0917db 100644
--- a/po/gutenprint.pot
+++ b/po/gutenprint.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr ""
 
@@ -90,18 +90,19 @@ msgstr ""
 msgid "Density"
 msgstr ""
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -148,9 +149,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr ""
 
@@ -158,300 +159,345 @@ msgstr ""
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr ""
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr ""
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr ""
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 msgid "CD - Custom"
 msgstr ""
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr ""
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr ""
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -484,9 +530,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr ""
 
@@ -502,11 +547,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -566,7 +611,7 @@ msgid "Output image type"
 msgstr ""
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -624,16 +669,56 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr ""
 
@@ -641,16 +726,56 @@ msgstr ""
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr ""
 
@@ -658,16 +783,56 @@ msgstr ""
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr ""
 
@@ -675,9 +840,11 @@ msgstr ""
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -685,7 +852,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -693,9 +860,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -704,16 +872,54 @@ msgid "Adjust the blue gamma"
 msgstr ""
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr ""
 
@@ -721,7 +927,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -734,7 +940,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr ""
 
@@ -742,7 +948,7 @@ msgstr ""
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr ""
 
@@ -767,10 +973,11 @@ msgstr ""
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -778,27 +985,27 @@ msgstr ""
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -927,455 +1134,513 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr ""
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr ""
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr ""
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr ""
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+msgid "Orange Map"
+msgstr ""
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the orange map"
+msgstr ""
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr ""
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr ""
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:494
-msgid "Gloss Level"
+#: src/main/print-escp2.c:487
+msgid "Orange Density"
+msgstr ""
+
+#: src/main/print-escp2.c:488
+msgid "Adjust the orange density"
 msgstr ""
 
 #: src/main/print-escp2.c:495
+msgid "Gloss Level"
+msgstr ""
+
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Light Cyan Value"
 msgstr ""
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Light Cyan Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 msgid "Light Magenta Value"
 msgstr ""
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Magenta Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 msgid "Dark Yellow Value"
 msgstr ""
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 msgid "Dark Yellow Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 msgid "Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 msgid "Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 msgid "Mid Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:1999
-msgid "Full Manual Control"
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
+msgid "Paper Thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:800
+msgid "Set printer paper thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:807
+msgid "Vacuum Intensity"
+msgstr ""
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
+msgid "Print Method"
+msgstr ""
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+msgid "Platen Gap"
+msgstr ""
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+msgid "Full Manual Control"
+msgstr ""
+
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1428,129 +1693,356 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr ""
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr ""
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr ""
 
@@ -1566,170 +2058,193 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr ""
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr ""
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr ""
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr ""
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr ""
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr ""
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr ""
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr ""
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr ""
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr ""
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr ""
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr ""
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr ""
 
@@ -1737,6067 +2252,9450 @@ msgstr ""
 msgid "PPDFile"
 msgstr ""
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr ""
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Model Name"
 msgstr ""
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr ""
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr ""
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr ""
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
 msgstr ""
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
 msgstr ""
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
-msgid "Four Color Photo"
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
 msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
+#: src/main/generic-options.c:46
+msgid "Text"
 msgstr ""
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
+#: src/main/generic-options.c:47
+msgid "Graphics"
 msgstr ""
 
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
 msgstr ""
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
+#: src/main/generic-options.c:49
+msgid "Photograph"
 msgstr ""
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
+#: src/main/generic-options.c:50
+msgid "Line Art"
 msgstr ""
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
+#: src/main/generic-options.c:55
+msgid "Page"
 msgstr ""
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
+#: src/main/generic-options.c:56
+msgid "Job"
 msgstr ""
 
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
+#: src/main/generic-options.c:68
+msgid "Image Type"
 msgstr ""
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
 msgstr ""
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
 msgstr ""
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
 msgstr ""
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
+#: src/main/generic-options.c:80
+msgid "Page Number"
 msgstr ""
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
+#: src/main/generic-options.c:81
+msgid "Page number"
 msgstr ""
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
 msgstr ""
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
 msgstr ""
 
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
 msgstr ""
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
 msgstr ""
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:284
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr ""
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:642
+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:1716
+msgid "Both"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr ""
+
+#: 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:144
+msgid "Printer Features"
+msgstr ""
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr ""
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr ""
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr ""
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr ""
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr ""
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr ""
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr ""
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+msgid "Media Size"
+msgstr ""
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+msgid "Color Model"
+msgstr ""
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+msgid "Inverted Grayscale"
+msgstr ""
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+msgid "RGB Color"
+msgstr ""
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr ""
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+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:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr ""
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr ""
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr ""
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr ""
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:783
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
 msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+msgid "Orange"
 msgstr ""
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
-msgid "Postcard"
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
-msgid "Back Light Film"
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
-msgid "Matte Paper Heavyweight"
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-msgid "ColorLife Paper"
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-msgid "Archival Matte Paper"
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-msgid "Manual Feed (Front)"
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
-msgid "Photo Board"
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
-msgid "360 x 90 DPI Fast Economy"
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
-msgid "180 DPI Economy"
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
-msgid "360 x 180 DPI Draft"
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Error: Rear cover open\n"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr ""
+
+#: src/escputil/escputil.c:1298
+#, c-format
+msgid "Printer Name: %s\n"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:68
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1499
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1770
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1774
+#, 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:1809
+#, 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:1853
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr ""
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1892
+#, 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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1913
+#, 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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr ""
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1937
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1950
+#, 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:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr ""
+
+#: src/escputil/escputil.c:2026
+#, 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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr ""
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr ""
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2088
+#, 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:2134
+#, c-format
+msgid "Error in input\n"
+msgstr ""
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2 src/xml/xmli18n-tmp.h:4 src/xml/xmli18n-tmp.h:6
+#: src/xml/xmli18n-tmp.h:8 src/xml/xmli18n-tmp.h:10 src/xml/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:14 src/xml/xmli18n-tmp.h:16 src/xml/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:20 src/xml/xmli18n-tmp.h:22 src/xml/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:26 src/xml/xmli18n-tmp.h:28 src/xml/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:32 src/xml/xmli18n-tmp.h:34 src/xml/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:38 src/xml/xmli18n-tmp.h:40 src/xml/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:44 src/xml/xmli18n-tmp.h:46 src/xml/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:50 src/xml/xmli18n-tmp.h:52 src/xml/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:56 src/xml/xmli18n-tmp.h:58 src/xml/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:62 src/xml/xmli18n-tmp.h:64 src/xml/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+msgid "Bright White Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
+msgid "Postcard"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
+msgid "Back Light Film"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
+msgid "Matte Paper Heavyweight"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:27
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:29
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+msgid "Ultra Glossy Photo Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:35
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:41
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+msgid "Ultra Premium Photo Paper Luster"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+msgid "ColorLife Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+msgid "Archival Matte Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
+msgid "360 x 90 DPI Fast Economy"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
+msgid "180 DPI Economy"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
+msgid "360 x 180 DPI Draft"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:87
-msgid "720 x 360 DPI Enhanced"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+msgid "2880 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
-msgid "2880 x 2880 DPI"
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+msgid "720 x 360 DPI Enhanced"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2922
+msgid "Black 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:2923
+msgid "Black 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+msgid "360 DPI Enhanced"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
+#: src/xml/xmli18n-tmp.h:2959
+msgid "1440 x 720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+msgid "Manual Feed (Front)"
 msgstr ""
 
-#: src/main/generic-options.c:46
-msgid "Text"
+#: src/xml/xmli18n-tmp.h:3104
+msgid "Photo Board"
 msgstr ""
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/generic-options.c:55
-msgid "Page"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:56
-msgid "Job"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:81
-msgid "Page number"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3210
+msgid "Default Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+msgid "Four Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 msgid "C0 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 msgid "C1 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 msgid "C2 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 msgid "C3 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 msgid "C4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 msgid "C5 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 msgid "B6-C4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 msgid "C6 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 msgid "DL landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 msgid "C7-6 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 msgid "C7 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 msgid "C8 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 msgid "C9 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 msgid "C10 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+msgid "Epson Artisan 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3823
+msgid "Epson Artisan 800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3824
+msgid "Epson B-300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3825
+msgid "Epson B-308"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3826
+msgid "Epson B-500DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3827
+msgid "Epson B-508DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 msgid "Epson Stylus C79"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 msgid "Epson Stylus C87"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 msgid "Epson Stylus C110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 msgid "Epson Stylus C120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+msgid "Epson Stylus Office B30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3902
+msgid "Epson Stylus Office B33"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3903
+msgid "Epson Stylus Office B40W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3904
+msgid "Epson Stylus Office T30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3905
+msgid "Epson Stylus Office T33"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3906
+msgid "Epson Stylus Office T40W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3907
+msgid "Epson Stylus Office BX300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3908
+msgid "Epson Stylus Office BX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3909
+msgid "Epson Stylus Office SX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3910
+msgid "Epson Stylus Offixe TX300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3911
+msgid "Epson Stylus Office TX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 msgid "Epson Stylus Photo 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 msgid "Epson Stylus Photo 1410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 msgid "Epson Stylus Photo R230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 msgid "Epson Stylus Photo R240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 msgid "Epson Stylus Photo R245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 msgid "Epson Stylus Photo R260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 msgid "Epson Stylus Photo R265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 msgid "Epson Stylus Photo R270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 msgid "Epson Stylus Photo R280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 msgid "Epson Stylus Photo R285"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+msgid "Epson Stylus Photo R290"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 msgid "Epson Stylus Photo R350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 msgid "Epson Stylus Photo R360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 msgid "Epson Stylus Photo R380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 msgid "Epson Stylus Photo R390"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3967
+msgid "Epson Stylus Photo R1900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 msgid "Epson Stylus Photo RX560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 msgid "Epson Stylus Photo RX580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 msgid "Epson Stylus Photo RX585"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 msgid "Epson Stylus Photo RX590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 msgid "Epson Stylus Photo RX595"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+msgid "Epson Stylus Photo RX610"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 msgid "Epson Stylus Photo RX640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 msgid "Epson Stylus Photo RX680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 msgid "Epson Stylus Photo RX685"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
-msgid "Epson Stylus Photo RX700"
+#: src/xml/xmli18n-tmp.h:3987
+msgid "Epson Stylus Photo RX690"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
+#: src/xml/xmli18n-tmp.h:3988
+msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+msgid "Epson Stylus Photo TX700W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+msgid "Epson Stylus Photo TX800W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+msgid "Epson Stylus Pro 7800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3997
+msgid "Epson Stylus Pro 7880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+msgid "Epson Stylus Pro 9800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4002
+msgid "Epson Stylus Pro 9880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+msgid "Epson Stylus Pro 11880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 msgid "Epson Stylus CX4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 msgid "Epson Stylus CX4900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 msgid "Epson Stylus CX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 msgid "Epson Stylus CX5000F"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+msgid "Epson Stylus CX5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4032
 msgid "Epson Stylus CX5600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 msgid "Epson Stylus CX6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 msgid "Epson Stylus CX7000F"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 msgid "Epson Stylus CX7400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+msgid "Epson Stylus CX9300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4047
 msgid "Epson Stylus CX9400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+msgid "Epson Stylus CX9400F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4049
+msgid "Epson Stylus CX9475F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 msgid "Epson Stylus D92"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 msgid "Epson Stylus D120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 msgid "Epson Stylus DX4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 msgid "Epson Stylus DX4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 msgid "Epson Stylus DX4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 msgid "Epson Stylus DX7000F"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 msgid "Epson Stylus DX7400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 msgid "Epson Stylus DX7450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 msgid "Epson Stylus DX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 msgid "Epson Stylus DX8450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+msgid "Epson Stylus DX9400F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4068
+msgid "Epson Stylus NX100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4069
+msgid "Epson Stylus NX200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4070
+msgid "Epson Stylus NX300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4071
+msgid "Epson Stylus NX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4072
+msgid "Epson Stylus PX700FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+msgid "Epson Stylus PX800FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4074
+msgid "Epson Stylus S20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4075
+msgid "Epson Stylus SX100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4076
+msgid "Epson Stylus SX105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4077
+msgid "Epson Stylus SX200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4078
+msgid "Epson Stylus SX205"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4079
+msgid "Epson Stylus SX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4080
+msgid "Epson Stylus SX405"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4081
+msgid "Epson Stylus T20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4082
+msgid "Epson Stylus TX100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4083
+msgid "Epson Stylus TX200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4084
+msgid "Epson Stylus TX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+msgid "Epson WorkForce 40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4106
+msgid "Epson WorkForce 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4107
+msgid "Epson WorkForce 600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+msgid "Epson ME Office 70"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4127
+msgid "Epson ME Office 80W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4128
+msgid "Epson ME Office 700FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+msgid "Epson Offirio PX B300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4183
+msgid "Epson Offirio PX B500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4184
+msgid "Epson PX 101"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4185
+msgid "Epson PX 201"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4186
+msgid "Epson PX 601F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+msgid "Epson PX G5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+msgid "Epson EPL-N2050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4282
+msgid "Epson EPL-N2050+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4283
+msgid "Epson EPL-N2050PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+msgid "Epson EPL-N2120"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4286
+msgid "Epson EPL-N2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4287
+msgid "Epson EPL-N2500PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4288
+msgid "Epson EPL-N2750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4289
+msgid "Epson EPL-N2750PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-msgid "Select File..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
+#: src/xml/xmli18n-tmp.h:4943
+msgid "Oki Super 6e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2123
-msgid "Set Printer Option Defaults"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/cups/genppd.c:151
-msgid "Common"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 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:1064
-msgid "English"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
 msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
 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"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 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"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 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"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
 msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
 msgstr ""
 
-#: src/escputil/escputil.c:783
-#, c-format
-msgid "Unknown printer %s!\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
 msgstr ""
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
 msgstr ""
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
 msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
 msgstr ""
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
 msgstr ""
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
 msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
 msgstr ""
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
 msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
 msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
 msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
 msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index d8bc0cc..1958e92 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 3b0b25f..6653e30 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,15 +1,15 @@
 # Hungarian translation of gutenprint.
-# Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
-#
+# Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gutenprint package.
 # Laszlo Dvornik <dvornikl@mailbox.hu>, 2004.
 # Andras Timar <timar@fsf.hu>, 2004.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint 5.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
-"PO-Revision-Date: 2007-11-06 19:32+0100\n"
+"Project-Id-Version: gutenprint 5.1.98.1\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
+"PO-Revision-Date: 2008-05-11 15:51+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -61,9 +61,8 @@ msgid "Ordered"
 msgstr "Rendezett"
 
 #: src/main/dither-main.c:65
-#, fuzzy
 msgid "Ordered New"
-msgstr "Rendezett"
+msgstr "Rendezett új"
 
 #: src/main/dither-main.c:66
 msgid "Fast"
@@ -83,28 +82,29 @@ msgstr "Előszórt bemenet"
 
 #: src/main/dither-main.c:70
 msgid "Drop Size Segmented"
-msgstr ""
+msgstr "Darabolt cseppméret"
 
 #: src/main/dither-main.c:71
 msgid "Drop Size Segmented New"
-msgstr ""
+msgstr "Darabolt cseppméret - új"
 
 #: src/main/dither-main.c:91 src/main/print-color.c:56
 msgid "Density"
 msgstr "Sűrűség"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr "Kimeneti szint igazítása"
 
@@ -165,9 +165,9 @@ msgstr "Színátalakítási modul"
 msgid "Dither algorithm"
 msgstr "Szórási algoritmus"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Oldalméret"
 
@@ -175,300 +175,345 @@ msgstr "Oldalméret"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "Nyomtató alapbeállításai"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "A nyomtatáshoz használt papír mérete"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Papír típusa"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "A hordozó típusa (egyszerű lap, fotópapír, stb.)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Papír forrása"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "A nyomtatáshoz használt hordozó forrása"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr "CD középpontjának mérete"
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 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:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr "CD méret (egyéni)"
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 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:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr "CD középpontjának mérete (egyéni)"
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 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:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr "CD vízszintes finomhangolása"
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Haladó nyomtatóbeállítások"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 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:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr "CD függőleges finomhangolása"
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Felbontás"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "A nyomtatás felbontása és minősége"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tinta típusa"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "A nyomtatóban levő tinta típusa"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr "Tintacsatornák"
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Haladó nyomtatófunkciók"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Nyomtatási mód"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Alap paraméter"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Nyomtatás kimeneti módja"
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr "Kétoldalas/fordítva beállítás"
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Nyomtatási minőség"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr "Alap kimenetvezérlés"
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Ciánkék sűrűsége"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "A nyomat ciánkék-sűrűségének beállítása"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Bíborvörös sűrűsége"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "A nyomat bíborvörös-sűrűségének beállítása"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Sárga sűrűsége"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "A nyomat sárga-sűrűségének beállítása"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Fekete sűrűsége"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "A nyomat fekete-sűrűségének beállítása"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Világos ciánkék átmenet"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Haladó tintabeállítás"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr "Világos bíborvörös átmenet"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr "Világossárga átmenet"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "hosszabbik él (szabvány)"
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr "Rövidebbik él (tükrözve)"
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "5 hüvelykes CD"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "3 hüvelykes CD"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 msgid "CD - Custom"
 msgstr "CD - Egyéni"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr "Normál"
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr "Nyomtatás a középpontig"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Színes"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Fekete-fehér"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Kézi vezérlés"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Szabványos"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Nagy pontosság"
@@ -501,9 +546,8 @@ msgstr "Nyers"
 msgid "Pre-Dithered"
 msgstr "Előszórt"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Szürkeárnyalatos"
 
@@ -519,11 +563,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -583,7 +627,7 @@ msgid "Output image type"
 msgstr "Kimeneti kép típusa"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr "Nyers csatornák"
 
@@ -643,16 +687,56 @@ msgstr "Alkalmazás Gamma"
 msgid "Gamma value assumed by application"
 msgstr "Az alkalmazás által feltételezett gamma érték"
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Ciánkék"
 
@@ -660,16 +744,56 @@ msgstr "Ciánkék"
 msgid "Adjust the cyan gamma"
 msgstr "A ciánkék gamma értékének beállítása"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Bíborvörös"
 
@@ -677,16 +801,56 @@ msgstr "Bíborvörös"
 msgid "Adjust the magenta gamma"
 msgstr "A bíborvörös gamma értékének beállítása"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Sárga"
 
@@ -694,9 +858,11 @@ msgstr "Sárga"
 msgid "Adjust the yellow gamma"
 msgstr "A sárga gamma értékének beállítása"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "Vörös"
 
@@ -704,7 +870,7 @@ msgstr "Vörös"
 msgid "Adjust the red gamma"
 msgstr "A vörös gamma értékének beállítása"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "Zöld"
 
@@ -712,9 +878,10 @@ msgstr "Zöld"
 msgid "Adjust the green gamma"
 msgstr "A zöld gamma értékének beállítása"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "Kék"
 
@@ -723,16 +890,54 @@ msgid "Adjust the blue gamma"
 msgstr "A kék gamma értékének beállítása"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Fekete"
 
@@ -740,7 +945,7 @@ msgstr "Fekete"
 msgid "Adjust the black gamma"
 msgstr "A fekete gamma értékének beállítása"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "Ciánkékegyensúly"
 
@@ -753,7 +958,7 @@ msgstr "Szürkeegyensúly"
 msgid "Adjust the cyan gray balance"
 msgstr "A ciánkék szürkeegyensúlyának beállítása"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "Bíborvörös-egyensúly"
 
@@ -761,7 +966,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "Sárgaegyensúly"
 
@@ -789,10 +994,11 @@ msgstr "Tintakorlát"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr "Haladó kimenetvezérlés"
 
@@ -800,37 +1006,37 @@ msgstr "Haladó kimenetvezérlés"
 msgid "Limit the total ink printed to the page"
 msgstr "Az oldalra összesen kinyomtatott tinta korlátozása"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr "GCR áttérés"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr "A szürkeösszetevő áttérési sebességének beállítása"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr "GCR alsó korlát"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr "A szürkeösszetevő csökkentésének alsó korlátja"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr "GCR felső korlát"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr "A szürkeösszetevő csökkentésének felső korlátja"
 
 #: src/main/print-color.c:421
 msgid "LUT dump file"
-msgstr ""
+msgstr "LUT kiíratásfájl"
 
 #: src/main/print-color.c:422
 msgid "Dump file for LUT for external color adjustment"
-msgstr ""
+msgstr "LUT kiíratásfájl a külső színigazításhoz"
 
 #: src/main/print-color.c:455 src/main/print-color.c:465
 #: src/main/print-color.c:473 src/main/print-color.c:481
@@ -949,77 +1155,77 @@ msgstr "Szürkeösszetevő-csökkentési görbe"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Hagyományos Gutenprint színátalakítás"
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "A(z) %s számára be kell állítani egy értéket\n"
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "\"%s\" nem érvényes %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "A(z) %s %f és %f között kell legyen (jelenleg %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "A(z) %s %d és %d között kell legyen (jelenleg %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "A(z) %s határainak %f és %f között kell lenniük\n"
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "A(z) %s tördelési módja a következő kell legyen: %s\n"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr "nincs tördelés"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr "tördelés"
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ismeretlen típusú paraméter: %s (%d)\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "A(z) %s kívül esik a tartományon (érték: %d, min.: %d, max.: %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "Érvénytelen oldalméret\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "A felső szegély kevesebb kell legyen, mint %d\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "A bal szegély nem lehet kevesebb, mint %d\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr "A magasság nullánál nagyobb kell legyen\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr "A szélesség nullánál nagyobb kell legyen\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1028,7 +1234,7 @@ msgstr ""
 "A kép túl széles az oldalhoz: a bal margó %d, a szélesség %d, a jobb szél %"
 "d\n"
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1037,390 +1243,440 @@ msgstr ""
 "A kép túl magas az oldalhoz: a felső margó %d, a magasság %d, az alsó szél %"
 "d\n"
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr "Automatikus nyomtatási mód"
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr "Alap kimenetvezérlés"
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "Automatikus nyomtatási mód"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "Nyomtatási minőség"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "A nyomat felbontása"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr "Kiterjesztett fényesség"
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr "Fényességkiterjesztés hozzáadása"
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr "Tintakészlet"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "Nyomtatás iránya"
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr "Haladó kimenetvezérlés"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 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:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr "Szegély nélküli"
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr "Nyomtatás szegélyek nélkül"
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr "Kihagyási módszer"
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr "A használandó kihagyásminta"
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr "Hangolja szükség szerint a pontméretet"
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr "Hangolja szükség szerint a pontméretet a kívánt sűrűség eléréséhez"
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr "Kimeneti sorrend"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr "Igazítási lépések"
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr "Igazítási lehetőségek"
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr "Tintacsere parancsa"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr "Alternatív igazítási lépések"
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr "Alternatív igazítási lehetőségek"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr "Támogatja a csomag módot"
 
-#: src/main/print-escp2.c:320
-#, fuzzy
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
-msgstr "Támogatja a csomag módot"
+msgstr "Támogatja a D4 csomag módot"
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
-msgstr ""
+msgstr "A tintapatronok cserélhetők"
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
-msgstr ""
+msgstr "Többféle tintapatron választható"
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr "Csatornanevek"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr "Nyers csatornaszám"
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr "Ciánkék-leképezés"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr "A ciánkék-leképezés beállítása"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr "Bíborvörös-leképezés"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr "A bíborvörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr "Sárga-leképezés"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr "A sárga-leképezés beállítása"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr "Kék-leképezés"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr "A kék-leképezés beállítása"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Ciánkék-leképezés"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "A vörös-leképezés beállítása"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr "Vörös-leképezés"
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr "A vörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Vörös sűrűsége"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "A vörös sűrűségének beállítása"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Kék sűrűsége"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "A kék sűrűségének beállítása"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Ciánkék sűrűsége"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "A vörös sűrűségének beállítása"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr "Fényesség szintje"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr "A fényesség szintjének beállítása"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
-msgstr ""
+msgstr "Kicsi cseppméret"
 
-#: src/main/print-escp2.c:503
-#, fuzzy
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
-msgstr "CD méret (egyéni)"
+msgstr "1-es cseppméret (kicsi)"
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
-msgstr ""
+msgstr "Közepes cseppméret"
 
-#: src/main/print-escp2.c:511
-#, fuzzy
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
-msgstr "CD méret (egyéni)"
+msgstr "2-es cseppméret (közepes)"
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
-msgstr ""
+msgstr "Nagy cseppméret"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
-msgstr ""
+msgstr "3-as cseppméret (nagy)"
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
-#, fuzzy
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Light Cyan Value"
-msgstr "Világos ciánkék"
+msgstr "Világos ciánkék értéke"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
-#, fuzzy
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Light Cyan Density Scale"
-msgstr "Ciánkék sűrűsége"
+msgstr "Világos ciánkék sűrűségaránya"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
-#, fuzzy
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 msgid "Light Magenta Value"
-msgstr "Világos bíborvörös"
+msgstr "Világos bíborvörös értéke"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
-#, fuzzy
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Magenta Density Scale"
-msgstr "Bíborvörös sűrűsége"
+msgstr "Világos bíborvörös sűrűségaránya"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
-#, fuzzy
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 msgid "Dark Yellow Value"
-msgstr "Sötétsárga"
+msgstr "Sötétsárga értéke"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr "Sötétsárga átmenet"
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
-#, fuzzy
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 msgid "Dark Yellow Density Scale"
-msgstr "Sárga sűrűsége"
+msgstr "Sötétsárga sűrűségaránya"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
-#, fuzzy
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 msgid "Gray Value"
-msgstr "Szürkeárnyalatos"
+msgstr "Szürke értéke"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 msgstr "Szürkeátmenet"
 
-#: 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 msgid "Gray Density Scale"
-msgstr "Szürkeárnyalatos"
+msgstr "Szürke sűrűségaránya"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
-#, fuzzy
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
-msgstr "Világosszürke-átmenet"
+msgstr "Világosszürke értéke"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 msgstr "Világosszürke-átmenet"
 
-#: 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
-msgstr "Világosszürke-átmenet"
+msgstr "Világosszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
-#, fuzzy
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
-msgstr "Sötétszürke-átmenet"
+msgstr "Sötétszürke értéke"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr "Sötétszürke-átmenet"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
-#, fuzzy
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
-msgstr "Sötétszürke-átmenet"
+msgstr "Sötétszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:694
-#, fuzzy
+#: src/main/print-escp2.c:695
 msgid "Mid Gray Value"
-msgstr "Szürkeárnyalatos"
+msgstr "Középsőszürke értéke"
 
-#: src/main/print-escp2.c:695
-#, fuzzy
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
-msgstr "Közepesszürke-átmenet"
+msgstr "Közepesszürke értéke"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr "Középsőszürke-átmenet"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr "Közepesszürke-átmenet"
 
-#: src/main/print-escp2.c:710
-#, fuzzy
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
-msgstr "Középsőszürke-átmenet"
+msgstr "Középsőszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:711
-#, fuzzy
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
-msgstr "Közepesszürke-átmenet"
+msgstr "Közepesszürke sűrűségaránya"
+
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
+#, fuzzy
+msgid "Paper Thickness"
+msgstr "Papírméret"
+
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Nyomtató alapértelmezéseinek beállítása"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Fekete sűrűsége"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
+#, fuzzy
+msgid "Print Method"
+msgstr "Nyomtatási mód"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Egyszerű lap"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+#, fuzzy
+msgid "Feed Adjustment"
+msgstr "Finomhangolás"
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
 msgid "Full Manual Control"
 msgstr "Teljesen kézi vezérlés"
 
-#: src/main/print-escp2.c:2001
+#: src/main/print-escp2.c:1966
 msgid "Automatic Setting Control"
 msgstr "Automatikus beállításvezérlés"
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Kézi vezérlés"
-
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Szabványos"
-
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr "Kétirányú"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr "Egyirányú"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr "Alternatív kitöltés"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr "Növekvő kitöltés"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr "Csökkenő kitöltés"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr "Növekvő dupla"
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr "Legközelebbi szomszéd elkerülése"
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+#, fuzzy
+msgid "Short Edge(Flip)"
+msgstr "Rövidebbik él (tükrözve)"
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: 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"
 
@@ -1473,129 +1729,356 @@ msgid "test print"
 msgstr "próbanyomtatás"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Négyszínű szabvány"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Háromszínű kompozit"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Hatszínes fénykép"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Ötszínes fénykép (kompozit)"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Egyszerű lap"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Fényes film"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "�tlátszóságok"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Borítékok"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Matt papír"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Inkjet papír"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotó minőségű Inkjet papír"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotópapír"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster fotópapír"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotó minőségű fényes papír"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford-féle nehéz papír"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Egyéb"
 
@@ -1611,170 +2094,193 @@ msgstr "Kézzel szünetekkel"
 msgid "Manual without Pause"
 msgstr "Kézzel szünetek nélkül"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr "Bevont"
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr "Nincs"
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr "Fényes"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr "Textúra"
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr "Laminált minta"
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "A ciánkék-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "A bíborvörös-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "A sárgaegyensúly beállítása"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "Feketeegyensúly"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "A feketeegyensúly beállítása"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Egyszerű"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Kiváló minőségű"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Fényes fotó"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "�tlátszóság"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Gyorsan száradó fénykép"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Gyorsan száradó fólia"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Kézi"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
-msgstr ""
+msgstr "1. tálca - mozgatható vezérlők"
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "1. tálca"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
-msgstr ""
+msgstr "2. tálca - mozgatható vezérlők"
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "2. tálca"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
-msgstr ""
+msgstr "3. tálca - mozgatható vezérlők"
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "3. tálca"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
-msgstr ""
+msgstr "4. tálca - mozgatható vezérlők"
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "4. tálca"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Hordozható lapadagoló"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Asztali lapadagoló"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Tálca"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Opcionális forrás"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Automatikus választás"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI fekete-fehér"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr "Piszkozat"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr "Magas"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "Fotó"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Színes + fekete patron"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Színes + fotó patronok"
 
@@ -1782,6229 +2288,9848 @@ msgstr "Színes + fotó patronok"
 msgid "PPDFile"
 msgstr "PPD fájl"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "PPD fájl"
 
-#: src/main/print-ps.c:74
-#, fuzzy
+#: src/main/print-ps.c:80
 msgid "Model Name"
-msgstr "Csatornanevek"
+msgstr "Típusnév"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
+msgstr "PPD fájl típusneve"
+
+#: src/main/print-ps.c:316
+msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Egyéni"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr "A kép méretének meg kell felelnie a papír méretének"
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Kétszintű szürkeárnyalatos"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr "Gyors, gazdaságos"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
-msgstr "Háromszintű szürkeárnyalatos"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr "Gazdaságos"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
+msgstr "Szuper fotó"
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
+msgstr "Ultra fotó"
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr "Legjobb"
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Szöveg"
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Grafika"
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Szöveg és grafika vegyesen"
+
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Fénykép"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Vonalrajz"
+
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Oldal"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Feladat"
+
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Képtípus"
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "A nyomtatott kép típusa"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Feladat módja"
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Feladat vagy oldal mód"
+
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Oldalszám"
+
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Oldalszám"
+
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Görbetípus"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "A görbe lineáris, spline-interpolált vagy szabadkézi-e"
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Minimális X"
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "X minimális lehetséges értéke"
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Maximum X"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "X maximális lehetséges értéke"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Minimális Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Y minimális lehetséges értéke"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Maximum Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Y maximális lehetséges értéke"
 
-#: src/main/escp2-channels.c:1466
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gamma érték"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Hüvelyk"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Az alapmértékegység hüvelykre állítása"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Az alapmértékegység centiméterre állítása"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Pont"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Az alapmértékegység pontra (1/72 hüvelyk) állítása"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr "mm"
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Az alapmértékegység milliméterre állítása"
+
+#: 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 "Az alapmértékegység pica-ra (1/12 hüvelyk) állítása"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Színes kimenet"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "A szürke szín árnyalataival való nyomtatás fekete tintával"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Szabványos parancs"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Szabványos nyomtatóparancs használata"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Egyéni parancs"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Egyéni nyomtatóparancs használata"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Fájl"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Nyomtatás fájlba"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Görbe szerkesztése..."
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Alapértelmezés beállítása"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Előző helyreállítása"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+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 "Mégsem"
+
+#: src/gutenprintui2/panel.c:642
+msgid "Select File..."
+msgstr "Válasszon fájlt..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr "Visszaállítás"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- nyomtatás v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Névjegy"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Nyomtatás és a\n"
+"beállítások mentése"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Beállítások\n"
+"mentése"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Nyomtatás"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Előnézet"
+
+#: 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 ""
+"A kép elhelyezése a lapon.\n"
+"Az elsődleges (általában a bal oldali) egérgomb lenyomása utáni húzással "
+"áthelyezheti a képet.\n"
+"A második egérgomb lenyomása utáni húzással finomabb áthelyezés végezhető; "
+"az elmozdítás pontonként történik (1/72\").\n"
+"A harmadik (középső) egérgomb lenyomása utáni húzással képméretnyi "
+"elmozdítás végezhető.\n"
+"Ha kattintás és húzás közben le van nyomva a Shift billentyű, akkor az "
+"elmozdítás csak vízszintes illetve függőleges irányban lesz lehetséges.\n"
+"Ha húzás közben lenyom egy másik egérgombot, akkor a kép visszakerül az "
+"eredeti helyére."
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Papírméret"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Minden papírméret mutatása"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Méretek:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Szélesség:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "A nyomtatáshoz használt papír szélessége"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Magasság:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "A nyomtatáshoz használt papír magassága"
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Automatikus papírméret"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Példányszám"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Válassza ki a nyomtatandó példányok számát, 1 és 100 között"
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Képpozíció"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automatikus"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "�lló"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Fekvő"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Fejjel lefelé"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Ellenkező fekvő"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Válasszon irányt: álló, fekvő, fejjel lefelé levő vagy fordított fekvő "
+"(fejjel lefelé levő fekvő)"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Elhelyezkedés:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Bal:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "A képnek a papír bal oldalától mért távolsága"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Jobb:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "A kép jobb oldalának a papír bal oldalától mért távolsága"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "A képnek a papír jobb oldalától mért távolsága"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Fent:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "A képnek a papír tetejétől mért távolsága"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Lent:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "A kép aljának a papír tetejétől mért távolsága"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "A képnek a papír aljától mért távolsága"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Középre:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Vízszintes"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "A kép középre igazítása vízszintes irányban a papíron"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Mindkettő"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "A kép középre igazítása a papíron"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Függőleges"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "A kép középre igazítása függőleges irányban a papíron"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Nyomtató beállítása"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Nyomtató gyártója:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Válassza ki a nyomtató gyártóját"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Nyomtató típusa:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Válassza ki a nyomtató típusát"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD fájl:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Adja meg a nyomtatóhoz tartozó PPD fájl nevét"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Tallózás"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Válassza ki a nyomtatóhoz tartozó PPD fájl nevét"
+
+#: 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 ""
+"Adja meg azon kimeneti sor nevét (ne a nyomtató típusát vagy a modelljét), "
+"amelyikbe nyomtatni kíván"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Nyomtatási sor:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Adja meg a nyomtatójára való nyomtatáshoz használandó parancsot. "
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Adja meg a fájlt, amelybe nyomtatni kíván. "
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "Nyomtatás ebbe a fájlba"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Nyomtatás fájlba"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Új nyomtató meghatározása"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Nyomtató neve:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Adja meg a logikai nyomtatóhoz használandó nevet"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "A Gutenprint névjegye "
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Gutenprint verzió: "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Nyomtató beállításai"
+
+#: 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 ""
+"Adja meg annak a nyomtatónak a nevét (ne a gyártmányt vagy a modellt), "
+"amelyikre nyomtatni kíván"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Nyomtató beállítása..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr "A nyomtatómodell, a PPD-fájl és a nyomtatást végző parancs megadása"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Új nyomtató..."
+
+#: 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 ""
+"Új logikai nyomtató felvétele. Egy olyan beállítási állapot elnevezésére "
+"használható, amelyet a jövőben is kíván használni."
+
+#: src/gutenprintui2/panel.c:2150
+msgid "Set Printer Option Defaults"
+msgstr "Nyomtató alapértelmezéseinek beállítása"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr "A nyomtató minden beállításának alapértelmezettre állítása"
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Képméret"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Méretezés:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Megadja a kép méretezését (méretét)"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Méretezés:"
+
+#: 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 ""
+"Megadja, hogy a méretezés a lapméret százalékában legyen-e mérve vagy a "
+"kimeneti pont/hüvelyk értékben"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Százalék"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Nyomat méretezése a lap mérete szerint"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Nyomat méretezése pont/hüvelyk érték szerint"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "A nyomat szélessége"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "A nyomat magassága"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Eredeti képméret\n"
+"használata"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "A nyomat méretének beállítása a kép méretére"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Nyomat színeinek beállítása"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Alapértelmezések beállítása"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Bezárás"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Előnézeti kép"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "Kimeneti csatornák megjelenítése:"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Kimenet"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Kimenet típusa:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Válassza ki a kívánt kimeneti típust"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Kimenet beállítása..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Színegyensúly, fényesség, kontraszt, telítettség és a színszórási módszer "
+"beállítása"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Mértékegységek:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Mértékegységek:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet"
+
+#: 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 "Nyomtató"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Alapértelmezett nyomtató)"
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr "Nyomtató szolgáltatásai"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr "Kimenetvezérlés"
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr "Közös"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr "1. extra"
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr "2. extra"
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr "3. extra"
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr "4. extra"
+
+#: src/cups/genppd.c:155
+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
+msgid "English"
+msgstr "Hungarian"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Hatszínes fénykép"
+msgid "Media Size"
+msgstr "Papír forrása"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Hatszínes (továbbfejlesztett, kompozit)"
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Feladat módja"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Hétszínes fénykép"
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Szürkeárnyalatos"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Hétszínes (továbbfejlesztett)"
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Színes"
 
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
-msgstr "Nyolcszínes fénykép"
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+#, fuzzy
+msgid "CMY Color"
+msgstr "Színes"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "Egyszínű nyers"
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+#, fuzzy
+msgid "Color Precision"
+msgstr "Színkorrekció"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+#, fuzzy
+msgid "Reverse"
+msgstr "Visszaállítás"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "Kétszínű nyers"
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr "Kétoldalas nyomtatás"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
-msgstr "Háromszínű nyers"
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr "Oldal zsugorítása szükség esetén a szegélyekig"
 
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
-msgstr "Háromszínű nyers fényes"
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr "Zsugorítás (teljes oldal nyomtatása)"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "Négyszínű nyers"
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr "Levágás (méretek megőrzése)"
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
-msgstr "Négyszínű nyers fényes"
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr "Nagyítás (teljes oldalterület használata)"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
-msgstr "Ötszínes nyers"
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "Nem"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Hatszínes nyers"
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "Igen"
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Hatszínes továbbfejlesztett, fényes nyers"
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr "Érték"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Hétszínes nyers"
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr "Finomhangolás"
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Hétszínes továbbfejlesztett, fényes nyers"
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil verzió "
 
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
-msgstr "Nyolcszínes nyers"
+#: 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-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
+"a Free Software Foundation által publikált GNU General Public\n"
+"License 2. vagy annál újabb verziója alapján.\n"
+"\n"
+"A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
+"bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
+"egy BIZONYOS CÉLRA VALÓ ALKALMASS�G sincs garantálva. További\n"
+"részletek a GNU General Public License-ben.\n"
+"\n"
+"A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
+"Public License-ből; ha nem így történt, írjon a következő címre:\n"
+"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n"
+"MA 02111-1307, USA.\n"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
-msgstr "Epson szabvány tinták"
+#: 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/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
-msgstr "UltraChrome fotó fekete"
+#: 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/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
-msgstr "UltraChrome matt fekete"
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Csak egy nyomtatót vagy nyers eszközt adhat meg."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Csak egy nyomtatótípust adhat meg."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Az igazítási választások értéke legalább 1 kell legyen."
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Az igazítási lépések értéke legallább 1 kell legyen."
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Ismeretlen kapcsoló: %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Használat: %s [KAPCSOLÓK] parancs\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "További információkért adja ki a(z) `%s --help' parancsot.\n"
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "További információkért adja ki a(z) `%s -h' parancsot.\n"
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Nem lehet megnyitni a(z) %s eszközt: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Nem lehet nyomtatni a(z) %s nyomtatóra ezzel: %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Nem lehet elküldeni a parancsot a nyomtatóra\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Az olvasás a nyomtatóról túllépte az időkorlátot\n"
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Nem lehet olvasni a következőről: %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr "Adjon meg egy nyers eszközt\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "A(z) %s nem nyitható meg írásra/olvasásra: %s\n"
+
+#: src/escputil/escputil.c:783
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Ismeretlen nyomtató: %s!\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "A(z) %s nem írható: %s\n"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"A(z) %s nem írható: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Nem lehet felismerni a nyomtató típusát.\n"
+"Használja az -m kapcsolót a nyomtató típusának megadásához.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr "Fotófekete"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
-msgstr "Matt fekete"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "Ismeretlen"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr "Világos ciánkék"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr "Világos bíborvörös"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr "Világos fekete"
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
-msgstr "Sötétsárga"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
+msgstr "Matt fekete"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr "Fényességoptimalizáló"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr "Világosszürke"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Egyszerű papír, gyors betöltéssel"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Oldal"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr "�llapot: Hiba\n"
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "�llapot: Önálló nyomtatás\n"
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr "�llapot: Foglalt\n"
+
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "�llapot: Várakozás\n"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr "�llapot: Tétlen\n"
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr "�llapot: Szünetel\n"
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "�llapot: Tisztítás\n"
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "�llapot: Gyári szállítás\n"
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "�llapot: Leállítás\n"
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "�llapot: Ismeretlen (%d)\n"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Hiba: Végzetes hiba\n"
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Hiba: Másik csatoló van kiválasztva\n"
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Hiba: A fedél nyitva\n"
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Hiba: A papír elakadt\n"
+
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Hiba: Elfogyott a tinta\n"
+
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Hiba: Elfogyott a papír\n"
+
+#: src/escputil/escputil.c:1078
+#, fuzzy, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Hiba: Helyreállíthatatlan vágóhiba\n"
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, 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:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Hiba: Dupla lapadagoló hiba\n"
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Hiba: Helyreállíthatatlan vágóhiba\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Hiba: Helyreállítható vágóelakadás\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Hiba: A tálcafedél nyitva\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Hiba: A CD tálca kint\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Hiba: Kártyabetöltési hiba\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Hiba: A tálcafedél nyitva\n"
+
+#: src/escputil/escputil.c:1114
+#, fuzzy, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Hiba: A tálcafedél nyitva\n"
+
+#: src/escputil/escputil.c:1117
+#, fuzzy, c-format
+msgid "Error: Front cover open\n"
+msgstr "Hiba: A tálcafedél nyitva\n"
+
+#: src/escputil/escputil.c:1120
+#, fuzzy, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Hiba: Másik csatoló van kiválasztva\n"
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Hiba: Ismeretlen (%d)\n"
+
+#: src/escputil/escputil.c:1135
+#, fuzzy, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Figyelmeztetés: Kevés a fekete tinta\n"
+
+#: src/escputil/escputil.c:1138
+#, fuzzy, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Figyelmeztetés: Kevés a fekete tinta\n"
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Figyelmeztetés: Ismeretlen (%d)\n"
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Fúvóka önteszt nyomtatása\n"
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Tintaszintek:\n"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Tinta színe"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Hátralevő százalék"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Nyomtató neve:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr "Feladat neve: "
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr "tintaszintek"
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "állapot"
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr "Tintapatron"
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr "Rész száma"
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "Dátum"
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "A nyomtatótípus nem azonosítható.\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Fejek tisztítása...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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:1809
+#, 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:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr "Kilépés\n"
+
+#: src/escputil/escputil.c:1870
+#, c-format
+msgid ""
+"Please inspect the final output very carefully to ensure that your\n"
+"printer is in proper alignment. You may now:\n"
+"  (s)ave the results in the printer,\n"
+"  (q)uit without saving the results, or\n"
+"  (r)epeat the entire process from the beginning.\n"
+"You will then be asked to confirm your choice.\n"
+"What do you want to do (s, q, r)?\n"
+msgstr ""
+"Vizsgálja meg alaposan a végső kimenetet, hogy megbizonyosodjon\n"
+"arról, hogy a nyomtatójának igazítása megfelelő. Ezután:\n"
+"  elmentheti az eredményeket a nyomtatóra (s)\n"
+"  kiléphet az eredmények mentése nélkül (q)\n"
+"  megismételheti az egész folyamatot az elejétől (r).\n"
+"Ezután a program a válasz megerősítését fogja kérni.\n"
+"Mit szeretne tenni (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, c-format
+msgid ""
+"OK, your printer is aligned, but the alignment has not been saved.\n"
+"If you wish to save the alignment, you must repeat this process.\n"
+msgstr ""
+"Rendben, a nyomtató igazítva van, de az igazítás nincs mentve.\n"
+"Ha menteni kívánja az igazítást, akkor meg kell ismételnie ezt a "
+"folyamatot.\n"
+
+#: src/escputil/escputil.c:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Az \"r\" betű lenyomásával erősítse meg, hogy meg kívánja ismételni az "
+"igazítási folyamatot:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Az igazítási folyamat megismétlése.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "A beállítások mentése..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "meghiúsult!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"A beállítások mentése meghiúsult. Ismételje meg az igazítási folyamatot.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "sikerült!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Azonosítatlan parancs.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Az utolsó parancsot nem erősítette meg.\n"
+
+#: src/escputil/escputil.c:1950
+#, 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:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Üssön enter-t a folytatáshoz > "
+
+#: src/escputil/escputil.c:2026
+#, c-format
+msgid ""
+"Please inspect the print, and choose the best pair of lines in each "
+"pattern.\n"
+"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
+msgstr ""
+"Vizsgálja meg a nyomatot és válassza ki a legjobb sorpárt minden egyes "
+"mintában.\n"
+"Adjon meg egy párszámot, a ?-et segítségért vagy az r-et a folyamat "
+"megismétléséhez.\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "#%d. menet"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Helyezzen be egy üres lapot.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "A szám kívül esik a tartományon!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Nem értelmezhető, amit írt!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Kísérlet az igazítás beállítására..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "sikeres.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Hiba a bemenetben\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Nyomtatás..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr "Epson szabvány tinták"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Matt papír"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Levelezőlap"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "Hátulról megvilágított film"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papír, nehéz"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
-msgstr "Kiváló minőségű félig fényes fotópapír"
-
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-msgid "ColorLife Paper"
-msgstr "ColorLife papír"
-
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-msgid "Archival Matte Paper"
-msgstr "Archiválási matt papír"
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Premium Presentation Paper Matte"
+msgstr "Premium Luster fotópapír"
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr "Vízfesték papír - Ragyogó fehér"
+#: src/xml/xmli18n-tmp.h:27
+#, fuzzy
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Tekercses adagoló"
+#: src/xml/xmli18n-tmp.h:29
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr "Tekercses adagoló (levágás minden lap után)"
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr "Tekercses adagoló (levágás nélkül)"
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
+msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "Kézi adagolás"
+#: src/xml/xmli18n-tmp.h:35
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "Nyomtatás CD-re"
+#: src/xml/xmli18n-tmp.h:37
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
-msgstr "Kézi lapvezérlő"
+#: src/xml/xmli18n-tmp.h:41
+#, fuzzy
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Premium Luster fotópapír"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-msgid "Manual Feed (Front)"
-msgstr "Kézi adagolás (elöl)"
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
-msgstr "Hátsó tálca"
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+msgid "ColorLife Paper"
+msgstr "ColorLife papír"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr "Első tálca"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
 
-#: src/main/escp2-papers.c:1988
-msgid "Photo Board"
-msgstr "Fotókarton"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Egyszerű papír, gyors betöltéssel"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr "Vágólap, 1. tálca"
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+msgid "Archival Matte Paper"
+msgstr "Archiválási matt papír"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
-msgstr "Vágólap, 2. tálca"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr "Vízfesték papír - Ragyogó fehér"
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
-msgstr "Vágólap, automatikus tálcaválasztás"
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
+msgstr "UltraChrome fotó fekete"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
-msgstr "Kézi kijelölés"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr "UltraChrome matt fekete"
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI Gyors, gazdaságos"
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 DPI Gazdaságos"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr "180 DPI Gazdaságos"
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 DPI Piszkozat"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
-msgstr "360 x 240 DPI Piszkozat"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 dpi Jó minőségű"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI továbbfejlesztett"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr "720 DPI Jó minőségű"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
+msgstr "360 x 120 DPI Gazdaságos"
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 DPI Legjobb minőségű"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr "360 x 240 DPI Piszkozat"
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
-msgstr "720 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr "720 DPI Jó minőségű"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI felcserélt"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 DPI felcserélt"
-
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
-msgstr "5760 x 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr "Sötétsárga"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr "Be"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI felcserélt"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
-msgstr "Kihagyás"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI továbbfejlesztett"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr "Teljes átfedés"
+#: src/xml/xmli18n-tmp.h:2922
+#, fuzzy
+msgid "Black 1"
+msgstr "Fekete"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
-msgstr "Négymenetes"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Fekete"
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
-msgstr "Teljes átfedés 2"
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI továbbfejlesztett"
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
-msgstr "Kihagyás 2"
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
-msgstr "Nyolclépéses"
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
+msgstr "Hátsó tálca"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Gyors, gazdaságos"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
+msgstr "Első tálca"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Gazdaságos"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "Kézi adagolás"
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Piszkozat"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "Nyomtatás CD-re"
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
-msgstr "Magas"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr "Tekercses adagoló (levágás minden lap után)"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Fotó"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
+msgstr "Tekercses adagoló (levágás nélkül)"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Szuper fotó"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Tekercses adagoló"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra fotó"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
+msgstr "Kézi lapvezérlő"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr "Legjobb"
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+msgid "Manual Feed (Front)"
+msgstr "Kézi adagolás (elöl)"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr "Szöveg"
+#: src/xml/xmli18n-tmp.h:3104
+msgid "Photo Board"
+msgstr "Fotókarton"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr "Grafika"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr "Vágólap, 1. tálca"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr "Szöveg és grafika vegyesen"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr "Vágólap, 2. tálca"
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "Fénykép"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
+msgstr "Vágólap, automatikus tálcaválasztás"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Vonalrajz"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr "Kézi kijelölés"
 
-#: src/main/generic-options.c:55
-msgid "Page"
-msgstr "Oldal"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "Egyszínű nyers"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr "Feladat"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
+msgstr "Háromszínű nyers"
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
-msgstr "Képtípus"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "Négyszínű nyers"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
-msgstr "A nyomtatott kép típusa"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
+msgstr "Ötszínes nyers"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
-msgstr "Feladat módja"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Hatszínes nyers"
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
-msgstr "Feladat vagy oldal mód"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
-msgstr "Oldalszám"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
+msgstr "Háromszínű nyers fényes"
 
-#: src/main/generic-options.c:81
-msgid "Page number"
-msgstr "Oldalszám"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
+msgstr "Négyszínű nyers fényes"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Hatszínes továbbfejlesztett, fényes nyers"
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Hétszínes továbbfejlesztett, fényes nyers"
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "Alapértelmezett"
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Hétszínes fénykép"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Hatszínes (továbbfejlesztett, kompozit)"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Hétszínes nyers"
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Kétszintű szürkeárnyalatos"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "Kétszínű nyers"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr "Nyolcszínes fénykép"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr "Nyolcszínes nyers"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+msgid "Four Color Photo"
+msgstr "Négyszínes fénykép"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
+msgstr "Kihagyás"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr "Teljes átfedés"
+
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr "Négymenetes"
+
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr "Teljes átfedés 2"
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr "Kihagyás 2"
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr "Nyolclépéses"
+
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr "Be"
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
-msgstr ""
+msgstr "3 1/2 x5"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6-os fotópapír (letéphető szegélyek)"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr "Mérnöki C 17x22"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3658
 msgid "C0 landscape"
-msgstr "Fekvő"
+msgstr "C0 fekvő"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3660
 msgid "C1 landscape"
-msgstr "Fekvő"
+msgstr "C1 fekvő"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3662
 msgid "C2 landscape"
-msgstr "Fekvő"
+msgstr "C2 fekvő"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3664
 msgid "C3 landscape"
-msgstr "Fekvő"
+msgstr "C3 fekvő"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3666
 msgid "C4 landscape"
-msgstr "Fekvő"
+msgstr "C4 fekvő"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3668
 msgid "C5 landscape"
-msgstr "Fekvő"
+msgstr "C5 fekvő"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3670
 msgid "B6-C4 landscape"
-msgstr "Fekvő"
+msgstr "B6-C4 fekvő"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3672
 msgid "C6 landscape"
-msgstr "Fekvő"
+msgstr "C6 fekvő"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3674
 msgid "DL landscape"
-msgstr "Fekvő"
+msgstr "DL fekvő"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3676
 msgid "C7-6 landscape"
-msgstr "Fekvő"
+msgstr "C7-6 fekvő"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3678
 msgid "C7 landscape"
-msgstr "Fekvő"
+msgstr "C7 fekvő"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3680
 msgid "C8 landscape"
-msgstr "Fekvő"
+msgstr "C8 fekvő"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3682
 msgid "C9 landscape"
-msgstr "Fekvő"
+msgstr "C9 fekvő"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3684
 msgid "C10 landscape"
-msgstr "Fekvő"
+msgstr "C10 fekvő"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr "ArchA felcserélt"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr "ArchB felcserélt"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr "ArchC felcserélt"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr "ArchD felcserélt"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr "ArchE felcserélt"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Amerikai írólap"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Európai írólap"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Nagy Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Nagy Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Kis paperback"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Penguin, kis paperback"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Penguin, nagy paperback"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki kártya"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku kártya"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japán hosszú boríték #3"
 
-#: src/main/xmli18n-tmp.h:137
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
-msgstr "Japán hosszú boríték #3"
+msgstr "Japán fekvő hosszú boríték #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japán hosszú boríték #4"
 
-#: src/main/xmli18n-tmp.h:139
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
-msgstr "Japán hosszú boríték #4"
+msgstr "Japán fekvő hosszú boríték #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Japán Kaku boríték #4"
 
-#: src/main/xmli18n-tmp.h:141
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
-msgstr "Japán Kaku boríték #4"
+msgstr "Japán fekvő Kaku boríték #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
-msgstr "Commercial 10"
+msgstr "Kereskedelmi 10"
 
-#: src/main/xmli18n-tmp.h:143
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
-msgstr "Commercial 10"
+msgstr "Fekvő kereskedelmi 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 meghívó"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Monarch boríték"
 
-#: src/main/xmli18n-tmp.h:146
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3721
 msgid "Monarch Envelope landscape"
-msgstr "Monarch boríték"
+msgstr "Fekvő Monarch boríték"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr "Kártya"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr "Széles levelezőlap"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr "Chilei Office"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr "Chilei dupla levél"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr "Chilei dupla Office"
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Egyéni"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89mm-es papírtekercs"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210 mm-es papírtekercs"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "13 hüvelykes papírtekercs"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "36 hüvelykes papírtekercs"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "4 hüvelykes papírtekercs"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr "1. szintű PostScript"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr "2. szintű PostScript"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:184
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
-msgstr "Canon BJC-1000"
+msgstr "Canon BJC-5100"
 
-#: src/main/xmli18n-tmp.h:185
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
-msgstr "Canon BJC-6500"
+msgstr "Canon BJC-5500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:193
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
-msgstr "Canon BJC-6500"
+msgstr "Canon BJC-8500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/main/xmli18n-tmp.h:211
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4500"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/main/xmli18n-tmp.h:214
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
-msgstr "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP5300"
 
-#: src/main/xmli18n-tmp.h:215
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
-msgstr "Canon PIXMA iP2000"
+msgstr "Canon PIXMA iP6000D"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/main/xmli18n-tmp.h:217
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
-msgstr "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iP8500"
 
-#: src/main/xmli18n-tmp.h:218
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
-msgstr "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iX5000"
 
-#: src/main/xmli18n-tmp.h:219
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
-msgstr "Canon PIXMA MP500"
+msgstr "Canon PIXMA Pro9500"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
 #, fuzzy
-msgid "Canon PIXMA MP170"
+msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP150"
 
-#: src/main/xmli18n-tmp.h:222
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3800
+msgid "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP180"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/main/xmli18n-tmp.h:224
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP520"
 
-#: src/main/xmli18n-tmp.h:225
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP610"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/main/xmli18n-tmp.h:227
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP710"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/main/xmli18n-tmp.h:229
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
-msgstr "Canon PIXMA MP700"
+msgstr "Canon PIXMA MP740"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/main/xmli18n-tmp.h:238
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
-msgstr "Canon i850"
+msgstr "Canon i80"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Epson E 150"
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:283
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3868
 msgid "Epson Stylus C110"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus C110"
 
-#: src/main/xmli18n-tmp.h:284
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3869
 msgid "Epson Stylus C120"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus C120"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/main/xmli18n-tmp.h:358
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3954
 msgid "Epson Stylus Photo R280"
-msgstr "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo R280"
 
-#: src/main/xmli18n-tmp.h:359
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3955
 msgid "Epson Stylus Photo R285"
-msgstr "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo R285"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/main/xmli18n-tmp.h:376
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3977
 msgid "Epson Stylus Photo RX585"
-msgstr "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX585"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/main/xmli18n-tmp.h:378
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3979
 msgid "Epson Stylus Photo RX595"
-msgstr "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX595"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/main/xmli18n-tmp.h:383
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3985
 msgid "Epson Stylus Photo RX680"
-msgstr "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX680"
 
-#: src/main/xmli18n-tmp.h:384
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3986
 msgid "Epson Stylus Photo RX685"
-msgstr "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX685"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX560"
+
+#: src/xml/xmli18n-tmp.h:3988
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
-msgstr "Epson Stylus Photo R800"
-
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:412
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4019
 msgid "Epson Stylus CX4400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4400"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:417
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4024
 msgid "Epson Stylus CX4900"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4900"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
 #, fuzzy
-msgid "Epson Stylus CX5600"
+msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4032
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX5600"
+
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/main/xmli18n-tmp.h:433
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4041
 msgid "Epson Stylus CX7400"
-msgstr "Epson Stylus CX3700"
+msgstr "Epson Stylus CX7400"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
 #, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 msgid "Epson Stylus CX9400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:441
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4052
 msgid "Epson Stylus D92"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus D92"
 
-#: src/main/xmli18n-tmp.h:442
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4053
 msgid "Epson Stylus D120"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus D120"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:445
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4056
 msgid "Epson Stylus DX4050"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4050"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:448
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4059
 msgid "Epson Stylus DX4400"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4400"
 
-#: src/main/xmli18n-tmp.h:449
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4060
 msgid "Epson Stylus DX4450"
-msgstr "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4450"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:451
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4062
 msgid "Epson Stylus DX7000F"
+msgstr "Epson Stylus DX7000F"
+
+#: src/xml/xmli18n-tmp.h:4063
+msgid "Epson Stylus DX7400"
+msgstr "Epson Stylus DX7400"
+
+#: src/xml/xmli18n-tmp.h:4064
+msgid "Epson Stylus DX7450"
+msgstr "Epson Stylus DX7450"
+
+#: src/xml/xmli18n-tmp.h:4065
+msgid "Epson Stylus DX8400"
+msgstr "Epson Stylus DX8400"
+
+#: src/xml/xmli18n-tmp.h:4066
+msgid "Epson Stylus DX8450"
+msgstr "Epson Stylus DX8450"
+
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
 msgstr "Epson Stylus CX7000F"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #, fuzzy
-msgid "Epson Stylus DX7400"
-msgstr "Epson Stylus DX4200"
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4074
 #, fuzzy
-msgid "Epson Stylus DX7450"
-msgstr "Epson Stylus DX4250"
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4075
 #, fuzzy
-msgid "Epson Stylus DX8400"
-msgstr "Epson Stylus CX8400"
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4076
 #, fuzzy
-msgid "Epson Stylus DX8450"
-msgstr "Epson Stylus DX3850"
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus DX4050"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:457
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
-msgstr "Epson PictureMate Flash"
+msgstr "Epson PictureMate Dash"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/main/xmli18n-tmp.h:462
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 100"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+#, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/main/xmli18n-tmp.h:467
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 260"
 
-#: src/main/xmli18n-tmp.h:468
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 270"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/main/xmli18n-tmp.h:470
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 290"
 
-#: src/main/xmli18n-tmp.h:471
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 500"
 
-#: src/main/xmli18n-tmp.h:472
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 2005"
+
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Epson E 500"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:479
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
-msgstr "Epson E 100"
+msgstr "Epson E 300"
 
-#: src/main/xmli18n-tmp.h:480
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
-msgstr "Epson E 100"
+msgstr "Epson E 500"
 
-#: src/main/xmli18n-tmp.h:481
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
-msgstr "Epson E 150"
+msgstr "Epson E 520"
 
-#: src/main/xmli18n-tmp.h:482
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
-msgstr "Epson E 100"
+msgstr "Epson E 700"
 
-#: src/main/xmli18n-tmp.h:483
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
-msgstr "Epson E 200"
+msgstr "Epson E 720"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:495
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
-msgstr "Epson PM 700C"
+msgstr "Epson PM 670C"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Epson PX G900"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Epson PX V500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:550
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
-msgstr "Epson PM 780C"
+msgstr "Epson PX V780"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
-msgstr "Brother HL-4Ve"
-
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
-msgstr "Brother HL-10V"
-
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
-msgstr "Brother HL-10h"
-
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
-msgstr "Brother HL-630"
-
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
-msgstr "Brother HL-660"
-
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
-msgstr "Brother HL-760"
-
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
-msgstr "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4211
+#, fuzzy
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/xml/xmli18n-tmp.h:4212
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:4213
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:4214
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:4215
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:4218
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/xml/xmli18n-tmp.h:4219
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/xml/xmli18n-tmp.h:4220
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:4221
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:4222
+#, fuzzy
+msgid "Brother HL-1430"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4223
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4224
+#, fuzzy
+msgid "Brother HL-1450"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4225
+#, fuzzy
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4226
+#, fuzzy
+msgid "Brother HL-1650"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+#, fuzzy
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4229
+#, fuzzy
+msgid "Brother HL-1850"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4230
+#, fuzzy
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+#, fuzzy
+msgid "Brother HL-2460"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:4233
+#, fuzzy
+msgid "Brother HL-2460N"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:4235
+#, fuzzy
+msgid "Brother HL-5030"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4236
+#, fuzzy
+msgid "Brother HL-5040"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4237
+#, fuzzy
+msgid "Brother HL-5050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4238
+#, fuzzy
+msgid "Brother HL-5070N"
+msgstr "Brother HL-1070"
+
+#: src/xml/xmli18n-tmp.h:4239
+#, fuzzy
+msgid "Brother HL-5140"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4240
+#, fuzzy
+msgid "Brother HL-5150D"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4241
+#, fuzzy
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:4244
+#, fuzzy
+msgid "Brother HL-7050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4245
+#, fuzzy
+msgid "Brother HL-7050N"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4284
+#, fuzzy
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr "�ltalános PCL 4 nyomtató"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "�ltalános PCL 4 nyomtató"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr "�ltalános PCL 5 nyomtató"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "�ltalános PCL 5 nyomtató"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr "�ltalános PCL 5c nyomtató"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "�ltalános PCL 5c nyomtató"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr "�ltalános PCL 5e nyomtató"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "�ltalános PCL 5e nyomtató"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "�ltalános PCL 6/PCL XL nyomtató"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "�ltalános PCL 6/PCL XL nyomtató"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+#, fuzzy
+msgid "Gestetner MP 5000"
+msgstr "Epson MC 5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P PCL5 támogatással"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P PS támogatással"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:777
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
-msgstr "HP LaserJet 1012"
+msgstr "HP LaserJet 1022"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+#, fuzzy
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+#, fuzzy
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+#, fuzzy
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2100"
+
+#: src/xml/xmli18n-tmp.h:4534
+#, fuzzy
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 1220"
+
+#: src/xml/xmli18n-tmp.h:4535
+#, fuzzy
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2300"
+
+#: src/xml/xmli18n-tmp.h:4536
+#, fuzzy
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:4537
+#, fuzzy
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4538
+#, fuzzy
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4539
+#, fuzzy
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4540
+#, fuzzy
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:4541
+#, fuzzy
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+#, fuzzy
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4551
+#, fuzzy
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4552
+#, fuzzy
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+#, fuzzy
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4200"
+
+#: src/xml/xmli18n-tmp.h:4558
+#, fuzzy
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+#, fuzzy
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4561
+#, fuzzy
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+#, fuzzy
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4565
+#, fuzzy
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+#, fuzzy
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9000"
+
+#: src/xml/xmli18n-tmp.h:4571
+#, fuzzy
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4572
+#, fuzzy
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4573
+#, fuzzy
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4574
+#, fuzzy
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4575
+#, fuzzy
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4576
+#, fuzzy
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4577
+#, fuzzy
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4578
+#, fuzzy
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4579
+#, fuzzy
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:4580
+#, fuzzy
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:4581
+#, fuzzy
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4582
+#, fuzzy
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+#, fuzzy
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4664
+#, fuzzy
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+#, fuzzy
+msgid "Infotec IS2035"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4670
+#, fuzzy
+msgid "Infotec IS2045"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+#, fuzzy
+msgid "Infotec IS2105"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4673
+#, fuzzy
+msgid "Infotec IS 2015"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4674
+#, fuzzy
+msgid "Infotec IS 2018"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+#, fuzzy
+msgid "Infotec IS 2060"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4677
+#, fuzzy
+msgid "Infotec IS 2075"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4678
+#, fuzzy
+msgid "Infotec IS 2122"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4679
+#, fuzzy
+msgid "Infotec IS 2127"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4680
+#, fuzzy
+msgid "Infotec IS 2132"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4681
+#, fuzzy
+msgid "Infotec IS 2135"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4682
+#, fuzzy
+msgid "Infotec IS 2145"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4683
+#, fuzzy
+msgid "Infotec IS 2151"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4684
+#, fuzzy
+msgid "Infotec IS 2160"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4685
+#, fuzzy
+msgid "Infotec IS 2175"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4686
+#, fuzzy
+msgid "Infotec IS 2215"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4687
+#, fuzzy
+msgid "Infotec IS 2216"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4688
+#, fuzzy
+msgid "Infotec IS 2220"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+#, fuzzy
+msgid "Infotec IS 2225"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4691
+#, fuzzy
+msgid "Infotec IS 2230"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4692
+#, fuzzy
+msgid "Infotec IS 2235"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4693
+#, fuzzy
+msgid "Infotec IS 2245"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4694
+#, fuzzy
+msgid "Infotec IS 2255"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4695
+#, fuzzy
+msgid "Infotec IS 2265"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4696
+#, fuzzy
+msgid "Infotec IS 2275"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4697
+#, fuzzy
+msgid "Infotec IS 2316"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4698
+#, fuzzy
+msgid "Infotec IS 2320"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4699
+#, fuzzy
+msgid "Infotec IS 2325"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4700
+#, fuzzy
+msgid "Infotec IS 2416"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4701
+#, fuzzy
+msgid "Infotec IS 2425"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4702
+#, fuzzy
+msgid "Infotec IS 2430"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4703
+#, fuzzy
+msgid "Infotec IS 2435"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4704
+#, fuzzy
+msgid "Infotec IS 2445"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4705
+#, fuzzy
+msgid "Infotec IS 3090"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4706
+#, fuzzy
+msgid "Infotec IS 3110"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4707
+#, fuzzy
+msgid "Infotec IS 3135"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4708
+#, fuzzy
+msgid "Infotec MP 2550"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+#, fuzzy
+msgid "Infotec MP 3350"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+#, fuzzy
+msgid "Infotec MP 4000"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+#, fuzzy
+msgid "Infotec MP 5000"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
-msgstr "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
-msgstr "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
-msgstr "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
-msgstr "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
-msgstr "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
-msgstr "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
-msgstr "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
-msgstr "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
-msgstr "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
-msgstr "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
-msgstr "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
-msgstr "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
-msgstr "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
-msgstr "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
-msgstr "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
-msgstr "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
-msgstr "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
-msgstr "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
-msgstr "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
-msgstr "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
-msgstr "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
-msgstr "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
-msgstr "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+#, fuzzy
+msgid "Lanier MP 1100"
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
-msgstr "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+#, fuzzy
+msgid "Lanier LD1100"
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
-msgstr "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
-msgstr "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
-msgstr "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
-msgstr "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
-msgstr "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
-msgstr "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
-msgstr "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
-msgstr "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
-msgstr "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
-msgstr "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
-msgstr "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
-msgstr "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
-msgstr "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
-msgstr "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
-msgstr "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
-msgstr "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
-msgstr "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
-msgstr "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+#, fuzzy
+msgid "Lanier MP 3350"
+msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
-msgstr "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
-msgstr "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4820
 #, fuzzy
-msgid "Sharp AR-M257"
-msgstr "Sharp AR-161"
+msgid "Lanier MP 4000"
+msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
-msgstr "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
-msgstr "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
-msgstr "Star LaserPrinter 8"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
-msgstr "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
-msgstr "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
-msgstr "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4826
+#, fuzzy
+msgid "Lanier MP 5000"
+msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
-msgstr "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
-msgstr "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
-msgstr "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
-msgstr "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
-msgstr "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
-msgstr "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4834
+#, fuzzy
+msgid "Lanier MP 9000"
+msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
-msgstr "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
-msgstr "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4840
+#, fuzzy
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4841
+#, fuzzy
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
-msgstr "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
-msgstr "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
-msgstr "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
-msgstr "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
-msgstr "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
-msgstr "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
-msgstr "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
-msgstr "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
-msgstr "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
-msgstr "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
-msgstr "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
-msgstr "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
-msgstr "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
-msgstr "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
-msgstr "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-#, fuzzy
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-#, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-#, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-#, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
-msgstr "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
-msgstr "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
-msgstr "Kodak Easyshare nyomtatódokk"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
-msgstr "NYERS ADAT 16 bit"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
-msgstr "NYERS ADAT 8 bit"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
-msgstr "Görbetípus"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "A görbe lineáris, spline-interpolált vagy szabadkézi-e"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "Minimális X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
-msgstr "X minimális lehetséges értéke"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "Maximum X"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
-msgstr "X maximális lehetséges értéke"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Minimális Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
-msgstr "Y minimális lehetséges értéke"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
-msgstr "Y maximális lehetséges értéke"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "_Gamma érték"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Hüvelyk"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Az alapmértékegység hüvelykre állítása"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Az alapmértékegység centiméterre állítása"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
-msgstr "Pont"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Az alapmértékegység pontra (1/72 hüvelyk) állítása"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "mm"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Az alapmértékegység milliméterre állítása"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "Pica"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Az alapmértékegység pica-ra (1/12 hüvelyk) állítása"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Színes kimenet"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "A szürke szín árnyalataival való nyomtatás fekete tintával"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "Szabványos parancs"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "Szabványos nyomtatóparancs használata"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "Egyéni parancs"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "Egyéni nyomtatóparancs használata"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Fájl"
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "Nyomtatás fájlba"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
-msgstr "Görbe szerkesztése..."
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
-msgstr "Alapértelmezés beállítása"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
-msgstr "Előző helyreállítása"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Mégsem"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Nyomtató beállítása..."
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-#, fuzzy
-msgid "Reset"
-msgstr "Legjobb"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- nyomtatás v%s"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Névjegy"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
 msgstr ""
-"Nyomtatás és a\n"
-"beállítások mentése"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
 msgstr ""
-"Beállítások\n"
-"mentése"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Nyomtatás"
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Előnézet"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
-"A kép elhelyezése a lapon.\n"
-"Az elsődleges (általában a bal oldali) egérgomb lenyomása utáni húzással "
-"áthelyezheti a képet.\n"
-"A második egérgomb lenyomása utáni húzással finomabb áthelyezés végezhető; "
-"az elmozdítás pontonként történik (1/72\").\n"
-"A harmadik (középső) egérgomb lenyomása utáni húzással képméretnyi "
-"elmozdítás végezhető.\n"
-"Ha kattintás és húzás közben le van nyomva a Shift billentyű, akkor az "
-"elmozdítás csak vízszintes illetve függőleges irányban lesz lehetséges.\n"
-"Ha húzás közben lenyom egy másik egérgombot, akkor a kép visszakerül az "
-"eredeti helyére."
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "Papírméret"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "Minden papírméret mutatása"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Méretek:"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Szélesség:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "A nyomtatáshoz használt papír szélessége"
+#: src/xml/xmli18n-tmp.h:4929
+#, fuzzy
+msgid "Oki OL400"
+msgstr "Okidata OL400"
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Magasság:"
+#: src/xml/xmli18n-tmp.h:4930
+#, fuzzy
+msgid "Oki OL400e"
+msgstr "Okidata OL400e"
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "A nyomtatáshoz használt papír magassága"
+#: src/xml/xmli18n-tmp.h:4931
+#, fuzzy
+msgid "Oki OL400ex"
+msgstr "Okidata OL400ex"
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
-msgstr "Automatikus papírméret"
+#: src/xml/xmli18n-tmp.h:4932
+#, fuzzy
+msgid "Oki OL410e"
+msgstr "Okidata OL410e"
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "Példányszám"
+#: src/xml/xmli18n-tmp.h:4933
+#, fuzzy
+msgid "Oki OL600e"
+msgstr "Okidata OL600e"
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Válassza ki a nyomtatandó példányok számát, 1 és 100 között"
+#: src/xml/xmli18n-tmp.h:4934
+#, fuzzy
+msgid "Oki OL610e/S"
+msgstr "Okidata OL610e/S"
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "Képpozíció"
+#: src/xml/xmli18n-tmp.h:4935
+#, fuzzy
+msgid "Oki OL800"
+msgstr "Okidata OL800"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automatikus"
+#: src/xml/xmli18n-tmp.h:4936
+#, fuzzy
+msgid "Oki OL810ex"
+msgstr "Okidata OL810ex"
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "�lló"
+#: src/xml/xmli18n-tmp.h:4937
+#, fuzzy
+msgid "Oki Okipage 6e"
+msgstr "Okidata Okipage 6e"
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Fekvő"
+#: src/xml/xmli18n-tmp.h:4938
+#, fuzzy
+msgid "Oki Okipage 6ex"
+msgstr "Okidata Okipage 6ex"
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Fejjel lefelé"
+#: src/xml/xmli18n-tmp.h:4939
+#, fuzzy
+msgid "Oki Okipage 8p"
+msgstr "Okidata Okipage 8p"
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Ellenkező fekvő"
+#: src/xml/xmli18n-tmp.h:4940
+#, fuzzy
+msgid "Oki Okipage 10e"
+msgstr "Okidata Okipage 10e"
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr ""
-"Válasszon irányt: álló, fekvő, fejjel lefelé levő vagy fordított fekvő "
-"(fejjel lefelé levő fekvő)"
+#: src/xml/xmli18n-tmp.h:4941
+#, fuzzy
+msgid "Oki Okipage 10ex"
+msgstr "Okidata Okipage 10ex"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Elhelyezkedés:"
+#: src/xml/xmli18n-tmp.h:4942
+#, fuzzy
+msgid "Oki Okipage 14ex"
+msgstr "Okidata Okipage 14ex"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Bal:"
+#: src/xml/xmli18n-tmp.h:4943
+#, fuzzy
+msgid "Oki Super 6e"
+msgstr "Okidata Super 6e"
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "A képnek a papír bal oldalától mért távolsága"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Jobb:"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "A kép jobb oldalának a papír bal oldalától mért távolsága"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "A képnek a papír jobb oldalától mért távolsága"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Fent:"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "A képnek a papír tetejétől mért távolsága"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Lent:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "A kép aljának a papír tetejétől mért távolsága"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "A képnek a papír aljától mért távolsága"
+#: src/xml/xmli18n-tmp.h:4952
+#, fuzzy
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Középre:"
+#: src/xml/xmli18n-tmp.h:4953
+#, fuzzy
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "Vízszintes"
+#: src/xml/xmli18n-tmp.h:4954
+#, fuzzy
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "A kép középre igazítása vízszintes irányban a papíron"
+#: src/xml/xmli18n-tmp.h:4955
+#, fuzzy
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Mindkettő"
+#: src/xml/xmli18n-tmp.h:4956
+#, fuzzy
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "A kép középre igazítása a papíron"
+#: src/xml/xmli18n-tmp.h:4957
+#, fuzzy
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "Függőleges"
+#: src/xml/xmli18n-tmp.h:4958
+#, fuzzy
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "A kép középre igazítása függőleges irányban a papíron"
+#: src/xml/xmli18n-tmp.h:4959
+#, fuzzy
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Nyomtató beállítása"
+#: src/xml/xmli18n-tmp.h:4960
+#, fuzzy
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
-msgstr "Nyomtató gyártója:"
+#: src/xml/xmli18n-tmp.h:4961
+#, fuzzy
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
-msgstr "Válassza ki a nyomtató gyártóját"
+#: src/xml/xmli18n-tmp.h:4962
+#, fuzzy
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Nyomtató típusa:"
+#: src/xml/xmli18n-tmp.h:4963
+#, fuzzy
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Válassza ki a nyomtató típusát"
+#: src/xml/xmli18n-tmp.h:4964
+#, fuzzy
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD fájl:"
+#: src/xml/xmli18n-tmp.h:4965
+#, fuzzy
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Adja meg a nyomtatóhoz tartozó PPD fájl nevét"
+#: src/xml/xmli18n-tmp.h:4966
+#, fuzzy
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Tallózás"
+#: src/xml/xmli18n-tmp.h:4967
+#, fuzzy
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Válassza ki a nyomtatóhoz tartozó PPD fájl nevét"
+#: src/xml/xmli18n-tmp.h:4968
+#, fuzzy
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr ""
-"Adja meg azon kimeneti sor nevét (ne a nyomtató típusát vagy a modelljét), "
-"amelyikbe nyomtatni kíván"
+#: src/xml/xmli18n-tmp.h:4969
+#, fuzzy
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "Nyomtatási sor:"
+#: src/xml/xmli18n-tmp.h:4970
+#, fuzzy
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "Adja meg a nyomtatójára való nyomtatáshoz használandó parancsot. "
+#: src/xml/xmli18n-tmp.h:4971
+#, fuzzy
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "Adja meg a fájlt, amelybe nyomtatni kíván. "
+#: src/xml/xmli18n-tmp.h:4972
+#, fuzzy
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
-msgstr "Nyomtatás ebbe a fájlba"
+#: src/xml/xmli18n-tmp.h:4973
+#, fuzzy
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "Nyomtatás fájlba"
+#: src/xml/xmli18n-tmp.h:4974
+#, fuzzy
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Új nyomtató meghatározása"
+#: src/xml/xmli18n-tmp.h:4975
+#, fuzzy
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Nyomtató neve:"
+#: src/xml/xmli18n-tmp.h:4976
+#, fuzzy
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Adja meg a logikai nyomtatóhoz használandó nevet"
+#: src/xml/xmli18n-tmp.h:4977
+#, fuzzy
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "A Gutenprint névjegye "
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Gutenprint verzió: "
+#: src/xml/xmli18n-tmp.h:4979
+#, fuzzy
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Nyomtató beállításai"
+#: src/xml/xmli18n-tmp.h:4980
+#, fuzzy
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr ""
-"Adja meg annak a nyomtatónak a nevét (ne a gyártmányt vagy a modellt), "
-"amelyikre nyomtatni kíván"
+#: src/xml/xmli18n-tmp.h:4981
+#, fuzzy
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Nyomtató beállítása..."
+#: src/xml/xmli18n-tmp.h:4982
+#, fuzzy
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr "A nyomtatómodell, a PPD-fájl és a nyomtatást végző parancs megadása"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Új nyomtató..."
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
-msgstr ""
-"Új logikai nyomtató felvétele. Egy olyan beállítási állapot elnevezésére "
-"használható, amelyet a jövőben is kíván használni."
+#: src/xml/xmli18n-tmp.h:4985
+#, fuzzy
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2123
+#: src/xml/xmli18n-tmp.h:4986
 #, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Alapértelmezések beállítása"
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4987
+#, fuzzy
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "Képméret"
+#: src/xml/xmli18n-tmp.h:4988
+#, fuzzy
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Méretezés:"
+#: src/xml/xmli18n-tmp.h:4989
+#, fuzzy
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Megadja a kép méretezését (méretét)"
+#: src/xml/xmli18n-tmp.h:4990
+#, fuzzy
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Méretezés:"
+#: src/xml/xmli18n-tmp.h:4991
+#, fuzzy
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr ""
-"Megadja, hogy a méretezés a lapméret százalékában legyen-e mérve vagy a "
-"kimeneti pont/hüvelyk értékben"
+#: src/xml/xmli18n-tmp.h:4992
+#, fuzzy
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Százalék"
+#: src/xml/xmli18n-tmp.h:4993
+#, fuzzy
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Nyomat méretezése a lap mérete szerint"
+#: src/xml/xmli18n-tmp.h:4994
+#, fuzzy
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:4995
+#, fuzzy
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Nyomat méretezése pont/hüvelyk érték szerint"
+#: src/xml/xmli18n-tmp.h:4996
+#, fuzzy
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "A nyomat szélessége"
+#: src/xml/xmli18n-tmp.h:4997
+#, fuzzy
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "A nyomat magassága"
+#: src/xml/xmli18n-tmp.h:4998
+#, fuzzy
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr ""
-"Eredeti képméret\n"
-"használata"
+#: src/xml/xmli18n-tmp.h:4999
+#, fuzzy
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "A nyomat méretének beállítása a kép méretére"
+#: src/xml/xmli18n-tmp.h:5000
+#, fuzzy
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Nyomat színeinek beállítása"
+#: src/xml/xmli18n-tmp.h:5001
+#, fuzzy
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Alapértelmezések beállítása"
+#: src/xml/xmli18n-tmp.h:5002
+#, fuzzy
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Bezárás"
+#: src/xml/xmli18n-tmp.h:5003
+#, fuzzy
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Előnézeti kép"
+#: src/xml/xmli18n-tmp.h:5004
+#, fuzzy
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
-msgstr "Kimeneti csatornák megjelenítése:"
+#: src/xml/xmli18n-tmp.h:5005
+#, fuzzy
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
-msgstr "Kimenet"
+#: src/xml/xmli18n-tmp.h:5006
+#, fuzzy
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Kimenet típusa:"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Válassza ki a kívánt kimeneti típust"
+#: src/xml/xmli18n-tmp.h:5008
+#, fuzzy
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Kimenet beállítása..."
+#: src/xml/xmli18n-tmp.h:5009
+#, fuzzy
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5010
+#, fuzzy
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-4600"
+
+#: src/xml/xmli18n-tmp.h:5011
+#, fuzzy
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-4600"
+
+#: src/xml/xmli18n-tmp.h:5012
+#, fuzzy
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:5013
+#, fuzzy
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:5014
+#, fuzzy
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:5015
+#, fuzzy
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:5016
+#, fuzzy
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:5017
+#, fuzzy
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:5018
+#, fuzzy
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:5019
+#, fuzzy
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:5020
+#, fuzzy
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:5021
+#, fuzzy
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:5022
+#, fuzzy
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:5023
+#, fuzzy
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
+
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
+
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
+
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
+
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
+
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
+
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:5032
+#, fuzzy
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7000"
+
+#: src/xml/xmli18n-tmp.h:5033
+#, fuzzy
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7000N"
+
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
+
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
 msgstr ""
-"Színegyensúly, fényesség, kontraszt, telítettség és a színszórási módszer "
-"beállítása"
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "Mértékegységek:"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
-msgstr " "
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Mértékegységek:"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5043
+#, fuzzy
+msgid "Savin 2560"
+msgstr "Canon i560"
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5046
+#, fuzzy
+msgid "Savin 40105"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "Nyomtató"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(Alapértelmezett nyomtató)"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr ""
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "Nyomtató szolgáltatásai"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr ""
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
-msgstr "Kimenetvezérlés"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/cups/genppd.c:151
-msgid "Common"
-msgstr "Közös"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
+msgstr ""
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
-msgstr "1. extra"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr ""
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
-msgstr "2. extra"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr ""
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
-msgstr "3. extra"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
-msgstr "4. extra"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
-msgstr "5. extra"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+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:1064
-msgid "English"
-msgstr "Hungarian"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin2"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
-msgstr "Kétoldalas nyomtatás"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
-msgstr "Oldal zsugorítása szükség esetén a szegélyekig"
+#: src/xml/xmli18n-tmp.h:5061
+#, fuzzy
+msgid "Savin 4060"
+msgstr "Canon S400"
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
-msgstr "Zsugorítás (teljes oldal nyomtatása)"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
-msgstr "Levágás (méretek megőrzése)"
+#: src/xml/xmli18n-tmp.h:5063
+#, fuzzy
+msgid "Savin 4090"
+msgstr "Canon S400"
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
-msgstr "Nagyítás (teljes oldalterület használata)"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "Nem"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "Igen"
+#: src/xml/xmli18n-tmp.h:5066
+#, fuzzy
+msgid "Savin 8020"
+msgstr "Canon S800"
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
-msgstr "Érték"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
-msgstr "Finomhangolás"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil verzió "
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+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"
+#: src/xml/xmli18n-tmp.h:5070
+#, fuzzy
+msgid "Savin 8030"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
 msgstr ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
-"a Free Software Foundation által publikált GNU General Public\n"
-"License 2. vagy annál újabb verziója alapján.\n"
-"\n"
-"A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
-"bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
-"egy BIZONYOS CÉLRA VALÓ ALKALMASS�G sincs garantálva. További\n"
-"részletek a GNU General Public License-ben.\n"
-"\n"
-"A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
-"Public License-ből; ha nem így történt, írjon a következő címre:\n"
-"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n"
-"MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:119
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\n"
-"  Commands:\n"
-"    -c|--clean-head    Clean the print head.\n"
-"    -n|--nozzle-check  Print a nozzle test pattern.\n"
-"                       Dirty or clogged nozzles will show as gaps in the\n"
-"                       pattern.  If you see any gaps, you should clean\n"
-"                       the print head.\n"
-"    -a|--align-head    Align the print head.  CAUTION: Misuse of this\n"
-"                       utility may result in poor print quality and/or\n"
-"                       damage to the printer.\n"
-"    -s|--status        Retrieve printer status.\n"
-"    -i|--ink-level     Obtain the ink level from the printer.  This "
-"requires\n"
-"                       read/write access to the raw printer device.\n"
-"    -e|--extended-ink-info     Obtain the extended ink information from the\n"
-"                       printer.  This requires read/write access to the raw\n"
-"                       printer device.\n"
-"    -d|--identify      Query the printer for make and model information.\n"
-"                       This requires read/write access to the raw printer\n"
-"                       device.\n"
-"    -l|--license       Display the license/warranty terms of this program.\n"
-"    -M|--list-models   List the available printer models.\n"
-"    -h|--help          Print this help message.\n"
-"  Options:\n"
-"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
-"                       Default is the default system printer.\n"
-"    -r|--raw-device    Specify the name of the device to write to directly\n"
-"                       rather than going through a printer queue.\n"
-"    -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"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 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"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Csak egy nyomtatót vagy nyers eszközt adhat meg."
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Csak egy nyomtatótípust adhat meg."
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
-msgstr "Az igazítási választások értéke legalább 1 kell legyen."
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
+msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
-msgstr "Az igazítási lépések értéke legallább 1 kell legyen."
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
+msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Ismeretlen kapcsoló: %c\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Használat: %s [KAPCSOLÓK] parancs\n"
+#: src/xml/xmli18n-tmp.h:5079
+#, fuzzy
+msgid "Savin 8065"
+msgstr "Canon i865"
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
-msgstr "További információkért adja ki a(z) `%s --help' parancsot.\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
+msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
-msgstr "További információkért adja ki a(z) `%s -h' parancsot.\n"
+#: src/xml/xmli18n-tmp.h:5081
+#, fuzzy
+msgid "Savin 8090"
+msgstr "Canon S800"
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Nem lehet megnyitni a(z) %s eszközt: %s\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Nem lehet nyomtatni a(z) %s nyomtatóra ezzel: %s\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Nem lehet elküldeni a parancsot a nyomtatóra\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
-msgstr "Az olvasás a nyomtatóról túllépte az időkorlátot\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
+msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Nem lehet olvasni a következőről: %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
-msgstr "Adjon meg egy nyers eszközt\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "A(z) %s nem nyitható meg írásra/olvasásra: %s\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Ismeretlen kapcsoló: %c\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "A(z) %s nem írható: %s\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
-"\n"
-"A(z) %s nem írható: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
-"\n"
-"Nem lehet felismerni a nyomtató típusát.\n"
-"Használja az -m kapcsolót a nyomtató típusának megadásához.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "Ismeretlen"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
+msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
-msgstr "�llapot: Hiba\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
-msgstr "�llapot: Önálló nyomtatás\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
-msgstr "�llapot: Foglalt\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
-msgstr "�llapot: Várakozás\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
-msgstr "�llapot: Tétlen\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr "�llapot: Szünetel\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr "Star LS-04"
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
-msgstr "�llapot: Tisztítás\n"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
-msgstr "�llapot: Gyári szállítás\n"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
+msgstr "Tally MT908"
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr "�llapot: Leállítás\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
-msgstr "�llapot: Ismeretlen (%d)\n"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
-msgstr "Hiba: Végzetes hiba\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
-msgstr "Hiba: Másik csatoló van kiválasztva\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
-msgstr "Hiba: A fedél nyitva\n"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
-msgstr "Hiba: A papír elakadt\n"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
-msgstr "Hiba: Elfogyott a tinta\n"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
-msgstr "Hiba: Elfogyott a papír\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
-msgstr "Hiba: Várakozás visszatérésre a letépési pozícióból\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
-msgstr "Hiba: Dupla lapadagoló hiba\n"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
-msgstr "Hiba: Helyreállíthatatlan vágóhiba\n"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
-msgstr "Hiba: Helyreállítható vágóelakadás\n"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
-msgstr "Hiba: A CD tálca kint\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
-msgstr "Hiba: Kártyabetöltési hiba\n"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
-msgstr "Hiba: A tálcafedél nyitva\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
-msgstr "Hiba: Ismeretlen (%d)\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
-msgstr "Fúvóka önteszt nyomtatása\n"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
-msgstr "Tintaszintek:\n"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Tinta színe"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Hátralevő százalék"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
-msgstr "Figyelmeztetés: Kevés a fekete tinta\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
-msgstr "Figyelmeztetés: Ismeretlen (%d)\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
-msgstr "Feladat neve: "
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
-msgstr "tintaszintek"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "állapot"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "A(z) %s lekérése nyers eszközt igényel.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "A kiterjesztett tintaadatok lekérése nyers eszközt igényel.\n"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
-msgstr "Rész száma"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "Dátum"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "A nyomtatóazonosítás nyers eszközt igényel.\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "A nyomtatótípus nem azonosítható.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Fejek tisztítása...\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
 
-#: src/escputil/escputil.c:1728
-#, 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/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/escputil/escputil.c:1732
-#, 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/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/escputil/escputil.c:1767
-#, 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/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
 
-#: src/escputil/escputil.c:1811
-#, 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/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
-msgstr "Kilépés\n"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/escputil/escputil.c:1828
-#, c-format
-msgid ""
-"Please inspect the final output very carefully to ensure that your\n"
-"printer is in proper alignment. You may now:\n"
-"  (s)ave the results in the printer,\n"
-"  (q)uit without saving the results, or\n"
-"  (r)epeat the entire process from the beginning.\n"
-"You will then be asked to confirm your choice.\n"
-"What do you want to do (s, q, r)?\n"
-msgstr ""
-"Vizsgálja meg alaposan a végső kimenetet, hogy megbizonyosodjon\n"
-"arról, hogy a nyomtatójának igazítása megfelelő. Ezután:\n"
-"  elmentheti az eredményeket a nyomtatóra (s)\n"
-"  kiléphet az eredmények mentése nélkül (q)\n"
-"  megismételheti az egész folyamatot az elejétől (r).\n"
-"Ezután a program a válasz megerősítését fogja kérni.\n"
-"Mit szeretne tenni (s, q, r)?\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-720"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-730"
 
-#: src/escputil/escputil.c:1843
-#, 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/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-740"
 
-#: src/escputil/escputil.c:1850
-#, c-format
-msgid ""
-"OK, your printer is aligned, but the alignment has not been saved.\n"
-"If you wish to save the alignment, you must repeat this process.\n"
-msgstr ""
-"Rendben, a nyomtató igazítva van, de az igazítás nincs mentve.\n"
-"Ha menteni kívánja az igazítást, akkor meg kell ismételnie ezt a "
-"folyamatot.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-750"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr ""
-"Az \"r\" betű lenyomásával erősítse meg, hogy meg kívánja ismételni az "
-"igazítási folyamatot:\n"
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY ES1"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Az igazítási folyamat megismétlése.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY ES2"
 
-#: src/escputil/escputil.c:1871
-#, 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/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY ES20"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "A beállítások mentése..."
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "meghiúsult!\n"
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
-msgstr ""
-"A beállítások mentése meghiúsult. Ismételje meg az igazítási folyamatot.\n"
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "sikerült!\n"
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
 
-#: src/escputil/escputil.c:1895
-#, 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/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Azonosítatlan parancs.\n"
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Az utolsó parancsot nem erősítette meg.\n"
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#: src/escputil/escputil.c:1908
-#, 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/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Üssön enter-t a folytatáshoz > "
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/escputil/escputil.c:1984
-#, c-format
-msgid ""
-"Please inspect the print, and choose the best pair of lines in each "
-"pattern.\n"
-"Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
-msgstr ""
-"Vizsgálja meg a nyomatot és válassza ki a legjobb sorpárt minden egyes "
-"mintában.\n"
-"Adjon meg egy párszámot, a ?-et segítségért vagy az r-et a folyamat "
-"megismétléséhez.\n"
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "#%d. menet"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr "NYERS ADAT 16 bit"
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Helyezzen be egy üres lapot.\n"
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr "NYERS ADAT 8 bit"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "A szám kívül esik a tartományon!\n"
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin2"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Nem értelmezhető, amit írt!\n"
+#~ msgid "Adjust dot size as necessary"
+#~ msgstr "Hangolja szükség szerint a pontméretet"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "A legjobb sorpár száma 1 és %d között kell legyen.\n"
+#~ msgid "Adjust dot size as necessary to achieve desired density"
+#~ msgstr "Hangolja szükség szerint a pontméretet a kívánt sűrűség eléréséhez"
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Kísérlet az igazítás beállítására..."
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Háromszintű szürkeárnyalatos"
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "sikeres.\n"
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Hétszínes (továbbfejlesztett)"
 
-#: src/escputil/escputil.c:2046
-#, 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 ""
+#~ msgid "720 x 720 DPI"
+#~ msgstr "720 x 720 DPI"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Hiba a bemenetben\n"
+#~ msgid "2880 x 1440 DPI Transposed"
+#~ msgstr "2880 x 1440 DPI felcserélt"
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Nyomtatás..."
+#~ msgid "ISO A4"
+#~ msgstr "ISO A4"
+
+#~ msgid "ISO A5"
+#~ msgstr "ISO A5"
 
 #~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 #~ msgstr ""
@@ -8074,6 +12199,3 @@ msgstr "Nyomtatás..."
 #~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 #~ msgstr ""
 #~ "HIBA: ijsgutenprint: A következő sor lekérése meghiúsult itt: %.0f\n"
-
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Fájl/Nyomtatás..."
diff --git a/po/ja.gmo b/po/ja.gmo
index 99270b9..b9d83ad 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index b8e4cdd..6107796 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print Version 4.2.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2002-10-07 19:10+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "½é´üÃͤËÌ᤹"
@@ -95,18 +95,19 @@ msgstr ""
 msgid "Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -165,9 +166,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "¥Ç¥£¥¶Êý¼°"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
@@ -176,320 +177,367 @@ msgstr "²èÁü¤Î¥µ¥¤¥º"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "ÍÑ»æ¤Î¼ïÎà"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "µë»æÊýË¡"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "²òÁüÅÙ"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "ColorLife Paper"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+#, fuzzy
+msgid "Print Quality"
+msgstr "720 DPI Highest Quality"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "¥«¥¹¥¿¥à"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "¥«¥é¡¼"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "¹õ¤ÈÇò"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "½ÐÎϤμïÎà:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "ɸ½à"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -524,9 +572,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "°õºþ"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
@@ -543,11 +590,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -613,7 +660,7 @@ msgid "Output image type"
 msgstr "½ÐÎϤμïÎà:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -681,16 +728,56 @@ msgstr "¥¬¥ó¥Þ:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "¥·¥¢¥ó (C)"
 
@@ -699,16 +786,56 @@ msgstr "¥·¥¢¥ó (C)"
 msgid "Adjust the cyan gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
@@ -717,16 +844,56 @@ msgstr "¥Þ¥¼¥ó¥¿ (M)"
 msgid "Adjust the magenta gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "²«¿§ (Y)"
 
@@ -735,9 +902,11 @@ msgstr "²«¿§ (Y)"
 msgid "Adjust the yellow gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -746,7 +915,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -755,9 +924,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -767,16 +937,54 @@ msgid "Adjust the blue gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "¹õ¿§"
 
@@ -785,7 +993,7 @@ msgstr "¹õ¿§"
 msgid "Adjust the black gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -800,7 +1008,7 @@ msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 msgid "Adjust the cyan gray balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
@@ -810,7 +1018,7 @@ msgstr "¥Þ¥¼¥ó¥¿ (M)"
 msgid "Adjust the magenta gray balance"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
@@ -841,10 +1049,11 @@ msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "½ÐÎϤμïÎà:"
@@ -853,27 +1062,27 @@ msgstr "½ÐÎϤμïÎà:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1019,505 +1228,570 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s ¤Ï¼ïÎà %s ¤ËÂФ¹¤ëŬÀڤʥѥé¥á¡¼¥¿¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %d, ºÇ¾® %d, ºÇÂç %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "²èÁü¥µ¥¤¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
-msgid "Print Quality"
-msgstr "720 DPI Highest Quality"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "¥·¥¢¥ó (C)"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "¹õ¤ÈÇò"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "¥·¥¢¥ó (C)"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Ç»ÅÙ:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "½ÐÎϤμïÎà:"
+msgid "Paper Thickness"
+msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "½é´üÃͤËÌ᤹"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Ç»ÅÙ:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Ä̾ï¤ÎÍÑ»æ"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "ɸ½à"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1570,129 +1844,356 @@ msgid "test print"
 msgstr "¥Æ¥¹¥È°õºþ"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Four Color Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Three Color Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Six Color Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "ÉõÅû"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "¤½¤Î¾"
 
@@ -1708,177 +2209,202 @@ msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ"
 msgid "Manual without Pause"
 msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "¹õ¤ÈÇò"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Ä̾ï"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "¹âµé"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "¥¹¥é¥¤¥É"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "¨´¥¥Õ¥©¥È"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "¨´¥¥¹¥é¥¤¥É"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "¼êÆ°"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "¥È¥ì¥¤£±"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "¥È¥ì¥¤£²"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "¥È¥ì¥¤£³"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "¥È¥ì¥¤£´"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "·ÈÂÓ¼°µë»æ"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "¥Ç¥¹¥¯¥È¥Ã¥×µë»æ"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "¥È¥ì¥¤"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "¼«Æ°ÁªÂò"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI ¥â¥Î¥¯¥í"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "¹â¤µ:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "¼Ì¿¿"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸"
 
@@ -1887,6664 +2413,10156 @@ msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸"
 msgid "PPDFile"
 msgstr "PPD ¥Õ¥¡¥¤¥ë:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "¥ì¥¿¡¼"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4ÈÇ"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "¥«¥¹¥¿¥à"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Two Level Grayscale"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-#, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Two Level Grayscale"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Four Color Photo"
+msgid "Ultra Photo"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Six Color Enhanced Composite"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Seven Color Photo"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr ""
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Seven Color Enhanced"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:49
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Six Color Photo"
+msgid "Photograph"
+msgstr "¼Ì¿¿"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "¥é¥¤¥ó¡¦¥¢¡¼¥È"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#: src/main/generic-options.c:55
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Seven Color Photo"
+msgid "Page"
+msgstr "²èÁü¤Î¥µ¥¤¥º"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr ""
 
-#: src/main/escp2-channels.c:1914
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Seven Color Enhanced"
+msgid "Image Type"
+msgstr "²èÁü¤Î¼ïÎà:"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/main/generic-options.c:69
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "Four Color Standard"
+msgid "Type of image being printed"
+msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Three Color Composite"
+msgid "Page Number"
+msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/escp2-channels.c:1981
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Three Color Composite"
+msgid "Page number"
+msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/curve.c:130
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Four Color Standard"
+msgid "Curve type"
+msgstr "¹õ¿§"
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "¥¤¥ó¥Á"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "¥»¥ó¥Á¥á¡¼¥È¥ë"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "Four Color Standard"
+msgid "Points"
+msgstr "°õºþ"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Seven Color Photo"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Six Color Photo"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Six Color Enhanced Composite"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: 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
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Seven Color Photo"
+msgid "Standard Command"
+msgstr "ɸ½à"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Seven Color Enhanced"
+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/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Six Color Photo"
+msgid "Print to a file"
+msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Six Color Photo"
+msgid "Set Default"
+msgstr "½é´üÃͤËÌ᤹"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+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 "¼è¤ê¾Ã¤·"
+
+#: src/gutenprintui2/panel.c:642
+#, fuzzy
+msgid "Select File..."
+msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- °õºþ v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "¾ðÊó"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"°õºþ¤È\n"
+"ÀßÄê¤ÎÊݸ"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"ÀßÄê¤Î\n"
+"Êݸ"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "°õºþ"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "¥×¥ì¥Ó¥å¡¼"
+
+#: src/gutenprintui2/panel.c:1475
+msgid ""
+"Position the image on the page.\n"
+"Click and drag with the primary button to position the image.\n"
+"Click and drag with the second button to move the image with finer "
+"precision; each unit of motion moves the image one point (1/72\")\n"
+"Click and drag with the third (middle) button to move the image in units of "
+"the image size.\n"
+"Holding down the shift key while clicking and dragging constrains the image "
+"to only horizontal or vertical motion.\n"
+"If you click another button while dragging the mouse, the image will return "
+"to its original position."
+msgstr ""
+"°õºþ»þ¤Î²èÁü¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£\n"
+"¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤·¤¿¾ì½ê¤Ë²èÁü¤¬ÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\n"
+"¥Þ¥¦¥¹¤Î±¦¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢ºÙ¤«¤¤¥ì¥Ù¥ë¤Ç²èÁü¤ò°ÜÆ°¤·¤Þ¤¹; Ìó 1/72 ¥¤"
+"¥ó¥Áñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
+"¥Þ¥¦¥¹¤ÎÃæ¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢²èÁü¤ÎÂ礭¤µ¤Îñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç"
+"¤¹¡£\n"
+"[SHIFT] ¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¤ò¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¿åÊ¿¤Þ¤¿¤Ï¿âľÊý¸þ¤Ë¤Î¤ß²èÁü"
+"¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
+"¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:1522
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Horizontal"
+msgstr "¿åÊ¿"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "ξü"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+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
+#, fuzzy
+msgid "Printer Make:"
+msgstr "¥×¥ê¥ó¥¿Ì¾:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "¥×¥ê¥ó¥¿Ì¾:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "¥Æ¥¹¥È°õºþ"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+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
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "Gimp-Print"
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó "
+
+#: 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
+#, fuzzy
+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
+#, fuzzy
+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 "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"¥ª¥ê¥¸¥Ê¥ë¤Î\n"
+"¥µ¥¤¥º¤ÎÍøÍÑ"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "°õºþ¥«¥é¡¼Ä´À°"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "½é´üÃͤËÌ᤹"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "ÊĤ¸¤ë"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+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
+#, fuzzy
+msgid "Size Units:"
+msgstr "ñ°Ì:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+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
+#, fuzzy
+msgid "Printer"
+msgstr "°õºþ"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "½ÐÎϤμïÎà:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "¥³¥Þ¥ó¥É:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "¥È¥ì¥¤£±"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "¥È¥ì¥¤£²"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "¥È¥ì¥¤£³"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "¥È¥ì¥¤£´"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Japanese"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Íѻ極¥¤¥º:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "¥«¥é¡¼"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "¥«¥é¡¼"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY ¿§"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil ¥Ð¡¼¥¸¥ç¥ó "
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n"
+"GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ¤¬\n"
+"ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"\n"
+"¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n"
+"´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n"
+"¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n"
+"\n"
+"µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n"
+"¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n"
+"Free Software Foundation, Inc., 56 Temple Place - \n"
+"Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\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 | -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"
+
+#: src/escputil/escputil.c:162
+#, fuzzy
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\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 | -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"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "¥×¥ê¥ó¥¿¤Þ¤¿¤ÏÄã¥ì¥Ù¥ë¤Î¥Ç¥Ð¥¤¥¹¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %s ¤Ç¤¹\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
+
+#: src/escputil/escputil.c:908
+#, 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:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "¹õ¿§"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "²«¿§ (Y)"
+msgid "Matte Black"
+msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "¹õ¿§"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "²èÁü¤Î¥µ¥¤¥º"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "ºÌÅÙ:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "¥¤¥ó¥¯¤Î¿§"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "»Ä¤ê¤Î³ä¹ç"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "¥×¥ê¥ó¥¿Ì¾:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, fuzzy, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+
+#: src/escputil/escputil.c:1499
+#, fuzzy, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
+
+#: src/escputil/escputil.c:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
+
+#: src/escputil/escputil.c:1770
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+"¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
+"²¼¤µ¤¤¡£\n"
+
+#: src/escputil/escputil.c:1774
+#, 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"
+"¤³¤Î¥Ä¡¼¥ë¤Ï 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:1809
+#, 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"
+"¤³¤Î¥Ä¡¼¥ë¤Ï 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:1853
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
+
+#: src/escputil/escputil.c:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+
+#: src/escputil/escputil.c:1892
+#, 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:1899
+#, 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:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
+
+#: src/escputil/escputil.c:1913
+#, 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"
+"ËÜÅö¤Ëµ¹¤·¤¤¤Ç¤¹¤«¡©\n"
+"¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+"\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "¼ºÇԤǤ¹¡ª\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
+"ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
+
+#: src/escputil/escputil.c:1937
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#: src/escputil/escputil.c:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 ""
+"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ EPSON %s ¤Ç¤¢¤ë¤ÈÁÛÄꤷ¤¿¤â¤Î¤Ç¤¹¡£\n"
+"¤â¤·¥×¥ê¥ó¥¿¤Î·¿¼°¤¬°Û¤Ê¤ë¾ì¹ç¤Ï¡¢[CTRL]+C ¤òÆþÎϤ·¤ÆÃæÃǤ·¡¢\n"
+"Àµ¤·¤¤¥×¥ê¥ó¥¿¤Î·¿¼°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
+"\n"
+"°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
+"ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
+
+#: src/escputil/escputil.c:2026
+#, 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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "¥Ñ¥¹ #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "´Ö³ÖÊäÀµÃæ..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
+
+#: src/escputil/escputil.c:2088
+#, 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"
+"³Æ¥é¥¤¥ó¤ÎºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤¬¥Ñ¥¿¡¼¥ó %d ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
+"¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
+"ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "¤Ï¤¬¤­"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgid "Premium Presentation Paper Matte"
+msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "ColorLife Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "¥í¡¼¥ë¼°µë»æ"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr ""
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "¼êÆ°"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "¼êÆ°"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "¼êÆ°"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "¥È¥ì¥¤"
+msgid "ColorLife Paper"
+msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
 
-#: src/main/escp2-papers.c:1988
-#, fuzzy
-msgid "Photo Board"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "¼«Æ°ÁªÂò"
+msgid "UltraChrome Photo Black"
+msgstr "Six Color Photo"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI ¥â¥Î¥¯¥í"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "600 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
 #, fuzzy
-msgid "720 DPI High Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgid "360 x 120 DPI Economy"
+msgstr "600x600 DPI ¥â¥Î¥¯¥í"
 
-#: src/main/escp2-resolutions.c:103
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 DPI"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "720 DPI High Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
 #, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgid "720 DPI Highest Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "²«¿§ (Y)"
+
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgid "Black 1"
+msgstr "¹õ¿§"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "¹õ¿§"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1200 DPI ¹âÉʼÁ"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "¥È¥ì¥¤"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+#, fuzzy
+msgid "Manual Feed"
+msgstr "¼êÆ°"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "¥í¡¼¥ë¼°µë»æ"
+
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgid "Manual Sheet Guide"
+msgstr "¼êÆ°"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "ÌÀ¤ë¤µ:"
+msgid "Manual Feed (Front)"
+msgstr "¼êÆ°"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "¥Õ¥©¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "¼«Æ°ÁªÂò"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "¹â¤µ:"
+msgid "One Color Raw"
+msgstr "Seven Color Photo"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "¼Ì¿¿"
+msgid "Three Color Raw"
+msgstr "Three Color Composite"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Four Color Raw"
+msgstr "Four Color Standard"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
+msgid "Five Color Raw"
+msgstr "Seven Color Photo"
+
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+#, fuzzy
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Seven Color Enhanced"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Three Color Composite"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "Four Color Standard"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+#, fuzzy
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Six Color Enhanced Composite"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
 #, fuzzy
-msgid "Photograph"
-msgstr "¼Ì¿¿"
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Seven Color Enhanced"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "¥é¥¤¥ó¡¦¥¢¡¼¥È"
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "½é´üÃͤËÌ᤹"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Seven Color Photo"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Six Color Enhanced Composite"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Page"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgid "Seven Color Raw"
+msgstr "Seven Color Photo"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Two Level Grayscale"
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
 #, fuzzy
-msgid "Image Type"
-msgstr "²èÁü¤Î¼ïÎà:"
+msgid "Two Color Raw"
+msgstr "Four Color Standard"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
+msgid "Eight Color Photo"
+msgstr "Six Color Photo"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Six Color Photo"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Six Color Photo"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "¥×¥ê¥ó¥¿Ì¾:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgid "Interleave 2"
+msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgid "Eight Pass"
+msgstr "ÌÀ¤ë¤µ:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "¥ì¥¿¡¼"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "¥ê¡¼¥¬¥ë"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "¥¿¥Ö¥í¥¤¥É"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "¥¨¥¯¥¼¥¯¥Æ¥£¥Ö"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "¥¹¡¼¥Ñ¡¼ B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4AÈÇ"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2AÈÇ"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0ÈÇ"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1ÈÇ"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2ÈÇ"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3ÈÇ"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4ÈÇ"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5ÈÇ"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6ÈÇ"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7ÈÇ"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8ÈÇ"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9ÈÇ"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10ÈÇ"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B (ISO)"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B (ISO)"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 (ISO)"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 (ISO)"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 (ISO)"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 (ISO)"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 (ISO)"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 (ISO)"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 (ISO)"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 (ISO)"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 (ISO)"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 (ISO)"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 (ISO)"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 (JIS)"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 (JIS)"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 (JIS)"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 (JIS)"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 (JIS)"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 (JIS)"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 (JIS)"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 (JIS)"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 (JIS)"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 (JIS)"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Monarch Envelope"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "¤Ï¤¬¤­"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "¥«¥¹¥¿¥à"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89mm ¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210mm ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C42ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C42ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "¹õ¿§"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "¥¤¥ó¥Á"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "¥»¥ó¥Á¥á¡¼¥È¥ë"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "°õºþ"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "¥«¥é¡¼¤Ç°õºþ¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "¹õ¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¤Î±Æ¤òÉÕ¤±¤Æ°õºþ¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "ɸ½à"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "¥³¥Þ¥ó¥É:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "¥Õ¥¡¥¤¥ë"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "½é´üÃͤËÌ᤹"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "¼è¤ê¾Ã¤·"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- °õºþ v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "¾ðÊó"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"°õºþ¤È\n"
-"ÀßÄê¤ÎÊݸ"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"ÀßÄê¤Î\n"
-"Êݸ"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "°õºþ"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "¥×¥ì¥Ó¥å¡¼"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"°õºþ»þ¤Î²èÁü¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£\n"
-"¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤·¤¿¾ì½ê¤Ë²èÁü¤¬ÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\n"
-"¥Þ¥¦¥¹¤Î±¦¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢ºÙ¤«¤¤¥ì¥Ù¥ë¤Ç²èÁü¤ò°ÜÆ°¤·¤Þ¤¹; Ìó 1/72 ¥¤"
-"¥ó¥Áñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
-"¥Þ¥¦¥¹¤ÎÃæ¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢²èÁü¤ÎÂ礭¤µ¤Îñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç"
-"¤¹¡£\n"
-"[SHIFT] ¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¤ò¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¿åÊ¿¤Þ¤¿¤Ï¿âľÊý¸þ¤Ë¤Î¤ß²èÁü"
-"¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
-"¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£"
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "À£Ë¡:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Éý:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "¹â¤µ:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "°ÌÃÖ"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "¼«Æ°"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "½ÄÃÖ¤­"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "²£ÃÖ¤­"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "¾å²¼"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "²£Ä¹"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
-"ÍÑ»æ¤ÎÊý¸þ¤òÁªÂò¤·¤Þ¤¹: ½ÄÃÖ¤­¡¢²£ÃÖ¤­¡¢¾å²¼¡¢¤Þ¤¿¤Ï²£Ä¹ (¾å²¼¤Ä¤­¤Î²£ÃÖ¤­)"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "ÍÑ»æ¤Î¸þ¤­:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "º¸Â¦:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "±¦Â¦:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "¾å¦:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "²¼Â¦:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Ãæ¿´:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "¿åÊ¿"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "ξü"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "¿âľ"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD ¥Õ¥¡¥¤¥ë:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "»²¾È"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-#, fuzzy
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "¥Æ¥¹¥È°õºþ"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Gimp-Print"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó "
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
-"¿·µ¬¤ËÏÀÍý¥×¥ê¥ó¥¿¤òÄêµÁ¤·¤Þ¤¹¡£¤³¤ì¤Ï¼¡²ó»ÈÍѤ¹¤ë¤¿¤á¤Ë³Ð¤¨¤Æ¤ª¤­¤¿¤¤ÀßÄê̾"
-"¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "½é´üÃͤËÌ᤹"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "³ÈÂç½Ì¾®:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
-"³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª"
-"Âò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "ÈæΨ"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"¥ª¥ê¥¸¥Ê¥ë¤Î\n"
-"¥µ¥¤¥º¤ÎÍøÍÑ"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "°õºþ¥«¥é¡¼Ä´À°"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "½é´üÃͤËÌ᤹"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "ÊĤ¸¤ë"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "½ÐÎϤμïÎà:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "½ÐÎϤμïÎà:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "½ÐÎϤÎÄ´À°..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
-"¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "ñ°Ì:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "ñ°Ì:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "°õºþ"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "½ÐÎϤμïÎà:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "¥³¥Þ¥ó¥É:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "¥È¥ì¥¤£±"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "¥È¥ì¥¤£²"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "¥È¥ì¥¤£³"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "¥È¥ì¥¤£´"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Japanese"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISO ¥é¥Æ¥ó£±"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil ¥Ð¡¼¥¸¥ç¥ó "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n"
-"GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ¤¬\n"
-"ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n"
-"\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n"
-"´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n"
-"¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n"
-"\n"
-"µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n"
-"¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n"
-"Free Software Foundation, Inc., 56 Temple Place - \n"
-"Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 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 --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"
 
-#: src/escputil/escputil.c:162
-#, fuzzy
-msgid ""
-"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 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 -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"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "¥×¥ê¥ó¥¿¤Þ¤¿¤ÏÄã¥ì¥Ù¥ë¤Î¥Ç¥Ð¥¤¥¹¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %s ¤Ç¤¹\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "ºÌÅÙ:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "¥¤¥ó¥¯¤Î¿§"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "»Ä¤ê¤Î³ä¹ç"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
 msgstr ""
-"¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
-"²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
-"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\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:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
-"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
-"\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï 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:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
-"ºÇ½ª½ÐÎϤǥץê¥ó¥¿¤¬Àµ¤·¤¤´Ö³Ö¤Ç°õºþ¤·¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"³Îǧ¸å¡¢¼¡¤ÎÃ椫¤éÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
-"  (s) ¥×¥ê¥ó¥¿¤ÎÃæ¤Ë¤³¤ÎÀßÄê¤òÊݸ¤¹¤ë\n"
-"  (q) ¤³¤ÎÀßÄê¤òÊݸ¤·¤Ê¤¤¤Ç½ªÎ»¤¹¤ë\n"
-"  (r) ºÇ½é¤ËÌá¤Ã¤ÆºÆ¤ÓÀßÄꤹ¤ë\n"
-"ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
-msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr ""
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 msgstr ""
-"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-"¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
-"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"¡Ú·Ù¹ð¡Û: ¤³¤ÎÁàºî¤Ï SEIKO EPSON ¤Î¾µÇ§¤òÆÀ¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-"          ¤Þ¤¿¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤Ë»³²¤òÍ¿¤¨¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
-"ËÜÅö¤Ëµ¹¤·¤¤¤Ç¤¹¤«¡©\n"
-"¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
-"\n"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "¼ºÇԤǤ¹¡ª\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
-"¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
-"ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
-"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ EPSON %s ¤Ç¤¢¤ë¤ÈÁÛÄꤷ¤¿¤â¤Î¤Ç¤¹¡£\n"
-"¤â¤·¥×¥ê¥ó¥¿¤Î·¿¼°¤¬°Û¤Ê¤ë¾ì¹ç¤Ï¡¢[CTRL]+C ¤òÆþÎϤ·¤ÆÃæÃǤ·¡¢\n"
-"Àµ¤·¤¤¥×¥ê¥ó¥¿¤Î·¿¼°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
-"\n"
-"°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
-"ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 msgstr ""
-"°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
-"¤¹¡£\n"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "¥Ñ¥¹ #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "´Ö³ÖÊäÀµÃæ..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
-"´Ö³ÖÊäÀµ¤¬Àµ¤·¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£ºÆÅ٥ƥ¹¥È¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¸å¤Ë\n"
-"³Æ¥é¥¤¥ó¤ÎºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤¬¥Ñ¥¿¡¼¥ó %d ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
-"ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "°õºþÃæ..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISO ¥é¥Æ¥ó£±"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Two Level Grayscale"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Seven Color Enhanced"
+
+#, 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"
@@ -8741,18 +12759,12 @@ msgstr "°õºþÃæ..."
 #~ msgid "High Gloss Film"
 #~ msgstr "¹â±ð¥Õ¥£¥ë¥à"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È¡¦¥«¡¼¥É"
 
 #~ msgid "Photo Paper Pro"
 #~ msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY ¿§"
-
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK ¿§"
 
@@ -9359,9 +13371,6 @@ msgstr "°õºþÃæ..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¼ïÎà¤Ç¤¹¡£"
 
-#~ msgid "Media Size:"
-#~ msgstr "Íѻ極¥¤¥º:"
-
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index 489eb60..033e0f8 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 2424932..19cd6fe 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,12 +1,12 @@
 # Norwegian/Bokmaal translation of gimp-print.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 0.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2002-07-01 19:36+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian/Bokmaal <no@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -92,18 +92,19 @@ msgstr ""
 msgid "Density"
 msgstr "Tetthet:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -151,9 +152,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Størrelse"
@@ -162,315 +163,361 @@ msgstr "Størrelse"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Innstillinger for parametere"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Oppløsning"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blekktype"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type blekk i skriveren"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Raskt heltall"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr ""
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Lys magenta"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Egendefinert"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Sort-hvitt"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Utskriftstype:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -505,9 +552,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -524,11 +570,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -594,7 +640,7 @@ msgid "Output image type"
 msgstr "Utskriftstype:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -658,16 +704,56 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -675,16 +761,56 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -692,16 +818,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Gul"
 
@@ -709,9 +875,11 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -719,7 +887,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -727,9 +895,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -738,16 +907,54 @@ msgid "Adjust the blue gamma"
 msgstr ""
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Sort"
 
@@ -755,7 +962,7 @@ msgstr "Sort"
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -769,7 +976,7 @@ msgstr "Gråtoner"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -778,7 +985,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Gul"
@@ -806,10 +1013,11 @@ msgstr "Blekktype"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utskriftstype:"
@@ -818,27 +1026,27 @@ msgstr "Utskriftstype:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -984,494 +1192,558 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s er ikke en gyldig dither-algoritme\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukjent skriver %s\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s utenfor området (verdi %d, min %d, maks %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Bildestørrelsen er ikke gyldig\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr ""
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Blekktype"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Avbryt"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gul"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Sort-hvitt"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Cyan"
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the orange map"
+msgstr ""
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Tetthet:"
+
+#: src/main/print-escp2.c:488
+msgid "Adjust the orange density"
+msgstr ""
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glanset film"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Gul"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Utskriftstype:"
+msgid "Paper Thickness"
+msgstr "Størrelse"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Sett til standardverdier"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Tetthet:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Raskt heltall"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Vanlig papir"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1524,129 +1796,356 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Vanlig papir"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Glanset film"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Gjennomsiktighet"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Konvolutter"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Annet"
 
@@ -1662,173 +2161,198 @@ msgstr "Manuell med pause"
 msgid "Manual without Pause"
 msgstr "Manuell uten pause"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanset film"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "Matt papir"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Sort-hvitt"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr ""
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Skriv ut"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Skuff 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Skuff 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Skuff 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Skuff 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Portabel arkmater"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Skuff"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Alternativ kilde"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Autovelg"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monokrom"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Høyde:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografi"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr ""
 
@@ -1837,6509 +2361,10001 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD fil:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD/Fil?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Avbryt"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Egendefinert"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
 #, fuzzy
-msgid "Two Level Grayscale"
-msgstr "Gråtoner"
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Gråtoner"
+msgid "Ultra Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr ""
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:49
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Farge"
+msgid "Photograph"
+msgstr "Fotografi"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Lineær"
+
+#: src/main/generic-options.c:55
+#, fuzzy
+msgid "Page"
+msgstr "Størrelse"
+
+#: src/main/generic-options.c:56
+msgid "Job"
 msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "Seven Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Image Type"
+msgstr "Bildetype:"
 
-#: src/main/escp2-channels.c:1705
+#: src/main/generic-options.c:69
 #, fuzzy
-msgid "Seven Color Enhanced"
-msgstr "Stylus Color Pro"
+msgid "Type of image being printed"
+msgstr "Type blekk i skriveren"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Page Number"
+msgstr "Størrelse"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Page number"
+msgstr "Størrelse"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
+#: src/gutenprintui2/curve.c:130
+#, fuzzy
+msgid "Curve type"
+msgstr "Sort"
+
+#: 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/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Tomme"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Sett basis måleenhet til tommer"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Sett basis måleenhet til centimeter"
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "Farge"
+msgid "Points"
+msgstr "Skriv ut"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Sett basis måleenhet til tommer"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
 
-#: src/main/escp2-channels.c:1981
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Stylus Color Pro"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Sett basis måleenhet til centimeter"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Farge"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Sett basis måleenhet til tommer"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Fargeutskrift"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr ""
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "Farge"
+msgid "Standard Command"
+msgstr "Standard"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Custom Command"
+msgstr "Kommando:"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: 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 "Fil"
+
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Farge"
+msgid "Print to a file"
+msgstr "Skriv ut til fil?"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr ""
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Farge"
+msgid "Set Default"
+msgstr "Sett til standardverdier"
+
+#: 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 "OK"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/gutenprintui2/panel.c:642
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Select File..."
+msgstr "Sett opp skriver..."
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Skriv ut v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Om"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Skriv ut og\n"
+"lagre innstillinger"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Lagre\n"
+"innstillinger"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Skriv ut"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: 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
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Stylus Color Pro"
+msgid "Paper Size"
+msgstr "Størrelse"
 
-#: src/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Størrelse:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Bredde:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Bredde på papiret du skal skrive ut på"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Høyde:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Høyde på papiret du skal skrive ut på"
+
+#: src/gutenprintui2/panel.c:1577
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Farge"
+msgid "Automatic Paper Size"
+msgstr "Størrelse"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: 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
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Stylus Photo"
+msgid "Image Position"
+msgstr "Posisjon"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Portrett"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Landskap"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Opp-ned"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Landskap"
+
+#: 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 "Orientering:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Venstre:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Avstand fra venstre kant av arket til bildet"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Høyre:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Avstand fra venstre kant av arket til høyre kant av bildet"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Avstand fra høyre kant av arket til bildet"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Øverst:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Avstand fra toppen av arket til bildet"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Nederst:"
+
+#: src/gutenprintui2/panel.c:1696
+#, fuzzy
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Avstand fra toppen av arket til nedre kant av bildet"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Avstand fra nedre kant av arket til bildet"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Sentrer:"
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "Horisontalt"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Sentrer bildet horisontalt på arket"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Begge"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Sentrer bildet på arket"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "Vertikalt"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Sentrer bildet vertikalt på arket"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Sett opp skriver"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "Skrivernavn:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "Velg din skrivermodell"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Raskt heltall"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Velg din skrivermodell"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD fil:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Bla gjennom"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Velg korrekt PPD-filnavn for din skriver"
+
+#: 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
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "Skrivernavn:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "testutskrift"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "Skriv ut til fil?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definer ny skriver"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Skrivernavn:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren"
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "Om Gimp-Print"
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Gimp-Print versjon "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Innstillinger for parametere"
+
+#: 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 "Sett opp skriver..."
+
+#: 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 "Ny skriver..."
+
+#: 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 "Sett til standardverdier"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Størrelse"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Skalering"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Sett skalering (størrelse) på bildet"
+
+#: 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 "Prosent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Skaler utskriften til størrelsen på papiret"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Skaler utskriften til antall punkter per tomme"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Sett bredde på utskriften"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Sett høyde for utskriften"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
 msgstr ""
+"Bruk opprinnelig\n"
+"bildestørrelse"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Sett til standardverdier"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Lukk"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Forhåndsvisning av bilde"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Utskriftstype:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Utskriftstype:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Velg ønsket type for utdata"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Juster utskrift..."
+
+#: 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 "Enheter:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+msgid " "
+msgstr ">"
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Enheter:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Velg basis måleenhet for utskrift"
+
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Skriv ut"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Sett opp skriver"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Innstillinger for parametere"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Utskriftstype:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Kommando:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "Skuff 1"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "Skuff 2"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "Skuff 3"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "Skuff 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Norwegian"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Mediestørrelse:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Farger"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Gråtoner"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Farger"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY-farge"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+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:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Du kan kun spesifisere én skriver eller rå enhet."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Du kan kun oppgi én skrivermodell."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Ukjent flagg %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Kan ikke åpne enhet %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Kan ikke skrive til skriver %s med %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Kan ikke sende kommando til skriver\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Kan ikke lese fra %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Skriverstatus krever bruk av en rå enhet.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Ukjent flagg %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Kan ikke skrive til %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Kan ikke skrive til %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Kan ikke finne skrivertype.\n"
+"Vennligst bruk -m for å spesifisere din skrivermodell.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapir"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "Matt papir"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "Gul"
+msgid "Matte Black"
+msgstr "Matt papir"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Sort"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
 #, fuzzy
-msgid "Plain Paper Fast Load"
-msgstr "Vanlig papir"
+msgid "Orange"
+msgstr "Størrelse"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Metning:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Feil i inndata\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Feil i inndata\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Feil i inndata\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Blekkfarge"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Prosent gjenstående"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Skrivernavn:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Du kan kun oppgi én skrivermodell."
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Renser hoder...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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:1809
+#, 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:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr ">"
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, 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 ""
+"OK, skriveren er justert, men justeringen er ikke lagret.\n"
+"Hvis du ønsker å lagre justeringen må d\n"
+
+#: src/escputil/escputil.c:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
+"skrive «r»:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Gjentar justeringsprosessen.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "I ferd med å lagre innstillinger..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "feilet!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "fullført!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Kommandoen ble ikke gjenkjent.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Siste kommando ble ikke bekreftet.\n"
+
+#: src/escputil/escputil.c:1950
+#, 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/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Trykk linjeskift for å fortsette > "
+
+#: src/escputil/escputil.c:2026
+#, 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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Gjennomgang #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Vennligst sett inn et nytt ark.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Tallet er utenfor gyldig område!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Kan ikke forstå det du skrev inn!\n"
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Prøver å sette justering..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "fullført.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Feil i inndata\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Skriver ut..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Matt papir"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Vanlig papir"
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Matt papir"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr ""
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr ""
+msgid "Ultra Glossy Photo Paper"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Manuell"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "Skriv ut til fil?"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuell"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuell"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Skuff"
+msgid "ColorLife Paper"
+msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
 #, fuzzy
-msgid "Photo Board"
-msgstr "Fotopapir"
+msgid "Plain Paper Fast Load"
+msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Autovelg"
+msgid "UltraChrome Photo Black"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI monokrom"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "2400x600 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+#, fuzzy
+msgid "360 x 120 DPI Economy"
+msgstr "600x600 DPI monokrom"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "1200 DPI"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 DPI"
+
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-#, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "150x150 DPI"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "150x150 DPI"
+msgid "Dark Yellow"
+msgstr "Gul"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "1200 DPI"
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "1200 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "2400x600 DPI"
+
+#: src/xml/xmli18n-tmp.h:2922
+#, fuzzy
+msgid "Black 1"
+msgstr "Sort"
+
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Sort"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "2400x600 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "150x150 DPI"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Skuff"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
 #, fuzzy
-msgid "Interleave"
-msgstr "Skrivernavn:"
+msgid "Manual Feed"
+msgstr "Manuell"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "Skriv ut til fil?"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Skrivernavn:"
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Lysstyrke:"
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapir"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Autovelg"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "Høyde:"
+msgid "One Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "Fotografi"
+msgid "Three Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Four Color Raw"
+msgstr "Farge"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
-msgstr "Stylus Photo"
+msgid "Five Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
+msgstr "Farge"
 
-#: src/main/generic-options.c:46
-msgid "Text"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "Farge"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
 #, fuzzy
-msgid "Photograph"
-msgstr "Fotografi"
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Farge"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Lineær"
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+#, fuzzy
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3210
 #, fuzzy
-msgid "Page"
-msgstr "Størrelse"
+msgid "Default Black"
+msgstr "Sett til standardverdier"
 
-#: src/main/generic-options.c:56
-msgid "Job"
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+#, fuzzy
+msgid "Seven Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Image Type"
-msgstr "Bildetype:"
+msgid "Seven Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Type blekk i skriveren"
+msgid "Two Level Grayscale"
+msgstr "Gråtoner"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+#, fuzzy
+msgid "Two Color Raw"
+msgstr "Farge"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Farge"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Farge"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Skrivernavn:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Størrelse"
+msgid "Interleave 2"
+msgstr "Skrivernavn:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Størrelse"
+msgid "Eight Pass"
+msgstr "Lysstyrke:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Fotopapir"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Landskap"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 invitasjon"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Konvolutt"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Konvolutt"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkort"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Egendefinert"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+#, fuzzy
+msgid "Canon PIXMA MP160"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3800
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 #, fuzzy
 msgid "Canon i80"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 770"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20ux"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20ux"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20ux"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20ux"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20ux"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+#, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4096
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+#, fuzzy
+msgid "Epson EPL-N2050PS+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Skrivernavn:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Sett opp skriver"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Stylus C60"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Stylus C60"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Sort"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Tomme"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Sett basis måleenhet til tommer"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Sett basis måleenhet til centimeter"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Skriv ut"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Sett basis måleenhet til tommer"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Sett basis måleenhet til centimeter"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Sett basis måleenhet til tommer"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Fargeutskrift"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "Standard"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Kommando:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Fil"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Skriv ut til fil?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Sett til standardverdier"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Sett opp skriver..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Skriv ut v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Om"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Skriv ut og\n"
-"lagre innstillinger"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"Lagre\n"
-"innstillinger"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Skriv ut"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Forhåndsvisning"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "Størrelse"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Størrelse:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Bredde:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Bredde på papiret du skal skrive ut på"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Høyde:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Høyde på papiret du skal skrive ut på"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "Størrelse"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Posisjon"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Auto"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Portrett"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Landskap"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Opp-ned"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Landskap"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientering:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Venstre:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Avstand fra venstre kant av arket til bildet"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Høyre:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Avstand fra venstre kant av arket til høyre kant av bildet"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Avstand fra høyre kant av arket til bildet"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Øverst:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Avstand fra toppen av arket til bildet"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Nederst:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Avstand fra toppen av arket til nedre kant av bildet"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Avstand fra nedre kant av arket til bildet"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Sentrer:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Horisontalt"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Sentrer bildet horisontalt på arket"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Begge"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Sentrer bildet på arket"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Vertikalt"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Sentrer bildet vertikalt på arket"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Sett opp skriver"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Skrivernavn:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "Velg din skrivermodell"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Raskt heltall"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Velg din skrivermodell"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD fil:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Bla gjennom"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Velg korrekt PPD-filnavn for din skriver"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Skrivernavn:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "testutskrift"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Skriv ut til fil?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Definer ny skriver"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Skrivernavn:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Om Gimp-Print"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Gimp-Print versjon "
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Innstillinger for parametere"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Sett opp skriver..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Ny skriver..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Sett til standardverdier"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Størrelse"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Skalering"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Sett skalering (størrelse) på bildet"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Prosent"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Skaler utskriften til størrelsen på papiret"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Skaler utskriften til antall punkter per tomme"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Sett bredde på utskriften"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Sett høyde for utskriften"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"Bruk opprinnelig\n"
-"bildestørrelse"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Sett til standardverdier"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Lukk"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Forhåndsvisning av bilde"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Utskriftstype:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Utskriftstype:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Velg ønsket type for utdata"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Juster utskrift..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Enheter:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr ">"
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Enheter:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Velg basis måleenhet for utskrift"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Skriv ut"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Sett opp skriver"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Innstillinger for parametere"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Utskriftstype:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Kommando:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "Skuff 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "Skuff 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "Skuff 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "Skuff 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Norwegian"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
 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"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Du kan kun spesifisere én skriver eller rå enhet."
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Du kan kun oppgi én skrivermodell."
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Ukjent flagg %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Kan ikke åpne enhet %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Kan ikke skrive til skriver %s med %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Kan ikke sende kommando til skriver\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Kan ikke lese fra %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "Skriverstatus krever bruk av en rå enhet.\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Ukjent flagg %s\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Kan ikke skrive til %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"Kan ikke finne skrivertype.\n"
-"Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Metning:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "Feil i inndata\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "Feil i inndata\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Sett opp skriver"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Blekkfarge"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Prosent gjenstående"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Du kan kun oppgi én skrivermodell."
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Renser hoder...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Kan ikke sende kommando til skriveren, avslutter.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr ">"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 msgstr ""
-"Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 msgstr ""
-"OK, skriveren er justert, men justeringen er ikke lagret.\n"
-"Hvis du ønsker å lagre justeringen må d\n"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
-"Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
-"skrive «r»:\n"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Gjentar justeringsprosessen.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "I ferd med å lagre innstillinger..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "feilet!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "fullført!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Innstillingene for justering er lagret til skriveren.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Kommandoen ble ikke gjenkjent.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Siste kommando ble ikke bekreftet.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Trykk linjeskift for å fortsette > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Gjennomgang #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Vennligst sett inn et nytt ark.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Tallet er utenfor gyldig område!\n"
+#: src/xml/xmli18n-tmp.h:5141
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Stylus C60"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Kan ikke forstå det du skrev inn!\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
+#: src/xml/xmli18n-tmp.h:5143
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Prøver å sette justering..."
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "fullført.\n"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Feil i inndata\n"
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Skriver ut..."
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Gråtoner"
+
+#, fuzzy
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Stylus Color Pro"
+
+#, fuzzy
+#~ msgid "720 x 720 DPI"
+#~ msgstr "1200 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Transposed"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "ISO A4"
+#~ msgstr "SRA4"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
@@ -8435,10 +12451,6 @@ msgstr "Skriver ut..."
 #~ msgstr "150x150 DPI"
 
 #, fuzzy
-#~ msgid "1440 x 1440 DPI High Quality"
-#~ msgstr "150x150 DPI"
-
-#, fuzzy
 #~ msgid "1440 x 1440 DPI Highest Quality"
 #~ msgstr "150x150 DPI"
 
@@ -8563,9 +12575,6 @@ msgstr "Skriver ut..."
 #~ msgid "T-Shirt Transfers"
 #~ msgstr "Overføring til T-skjorte"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Glanset fotopapir"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Glansete fotokort"
 
@@ -8581,9 +12590,6 @@ msgstr "Skriver ut..."
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK-farge"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY-farge"
-
 #~ msgid "<Image>/File/Print..."
 #~ msgstr "<Image>/Fil/Skriv ut..."
 
@@ -9062,9 +13068,6 @@ msgstr "Skriver ut..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Type media du skal skrive ut på"
 
-#~ msgid "Media Size:"
-#~ msgstr "Mediestørrelse:"
-
 #~ msgid "Media Source:"
 #~ msgstr "Mediekilde:"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index c2e29e3..100616c 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index c5167cf..41afe36 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,28 +1,29 @@
+# translation of gutenprint-5.2.0-rc1.po to Dutch
 # Dutch translations for gutenprint.
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gutenprint package.
 #
 # Vincent van Adrighem <vincent@dirck.mine.nu>, 2002.
-# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2006, 2007.
 # Benno Schulenberg <benno@vertaalt.nl>, 2008.
+# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint-5.1.98.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
-"PO-Revision-Date: 2008-04-22 22:01+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Project-Id-Version: gutenprint-5.2.0-rc1\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
+"PO-Revision-Date: 2008-10-09 20:51+0200\n"
+"Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Standaard"
 
@@ -83,28 +84,29 @@ msgstr "Invoer met toegepast ruis-algoritme"
 
 #: src/main/dither-main.c:70
 msgid "Drop Size Segmented"
-msgstr ""
+msgstr "Gesegmenteerde druppelgrootte"
 
 #: src/main/dither-main.c:71
 msgid "Drop Size Segmented New"
-msgstr ""
+msgstr "Nieuwe gesegmenteerde druppelgrootte"
 
 #: src/main/dither-main.c:91 src/main/print-color.c:56
 msgid "Density"
 msgstr "Dichtheid"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr "Aanpassing van uitvoerniveau"
 
@@ -162,9 +164,9 @@ msgstr "Kleurconversie-module"
 msgid "Dither algorithm"
 msgstr "Ruis-algoritme"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Paginagrootte"
 
@@ -172,301 +174,345 @@ msgstr "Paginagrootte"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "Printerinstellingen"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Grootte van het papier waarop geprint wordt"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Type medium"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type medium (blanco papier, fotopapier, etc.)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Bronmedium"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Bronmedium (invoerpoort)"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
-#, fuzzy
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
-msgstr "Afmeting CD-printdeel"
+msgstr "Binnenafmeting CD-printdeel"
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 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:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr "CD-grootte (handmatig)"
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Variabele aanpassing van de buitendiameter van de CD"
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr "Afmeting van CD-printdeel (handmatig)"
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 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:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Horizontale fijnafstelling van CD"
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Geavanceerde instelling van de printer"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 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:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr "Verticale fijnafstelling van CD"
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Resolutie"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Resolutie en kwaliteit van de afdruk"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type inkt"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type inkt van de printer"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr "Inktkanalen"
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Geavanceerde functionaliteit van de printer"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Wijze van printen"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Hoofdparameters"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Manier van printen"
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "Dubbelzijdig printen"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Omkeer stand"
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Printkwaliteit"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr "Basis uitvoeraanpassing"
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Hoeveelheid cyaan"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Hoeveelheid magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Hoeveelheid geel"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Hoeveelheid zwart"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Lichtcyaan-overgang"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Geavanceerde aanpassing van de inkt"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr "Lichtmagenta-overgang"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr "Lichtgeel-overgang"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr "Uit"
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Lange zijde (standaard)"
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 msgid "CD - Custom"
 msgstr "CD - handmatig"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr "Afdrukken naar tussenstation"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Zwart en wit"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Handmatige controle"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standaard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Hoge nauwkeurigheid"
@@ -499,9 +545,8 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Voorbehandeld met ruis-algoritme"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Grijsschaal"
 
@@ -517,11 +562,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -581,7 +626,7 @@ msgid "Output image type"
 msgstr "Beeldtype van de uitvoer"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr "Raw-kanalen"
 
@@ -641,16 +686,56 @@ msgstr "Toepassingsgamma"
 msgid "Gamma value assumed by application"
 msgstr "De gammawaarde die verondersteld wordt door de applicatie"
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyaan"
 
@@ -658,16 +743,56 @@ msgstr "Cyaan"
 msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -675,16 +800,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Geel"
 
@@ -692,9 +857,11 @@ msgstr "Geel"
 msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "Rood"
 
@@ -702,7 +869,7 @@ msgstr "Rood"
 msgid "Adjust the red gamma"
 msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "Groen"
 
@@ -710,9 +877,10 @@ msgstr "Groen"
 msgid "Adjust the green gamma"
 msgstr "Pas de hoeveelheid groen aan"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "Blauw"
 
@@ -721,16 +889,54 @@ msgid "Adjust the blue gamma"
 msgstr "Pas de hoeveelheid blauw aan"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Zwart"
 
@@ -738,7 +944,7 @@ msgstr "Zwart"
 msgid "Adjust the black gamma"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "Cyaanwaarde"
 
@@ -751,7 +957,7 @@ msgstr "Grijswaarde"
 msgid "Adjust the cyan gray balance"
 msgstr "Pas de cyaan-grijsbalans aan"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "Magentawaarde"
 
@@ -759,7 +965,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "Geelwaarde"
 
@@ -787,10 +993,11 @@ msgstr "Inktgrenswaarde"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr "Geavanceerde controle van uitvoer"
 
@@ -798,37 +1005,37 @@ msgstr "Geavanceerde controle van uitvoer"
 msgid "Limit the total ink printed to the page"
 msgstr "Beperk de totale hoeveelheid inkt naar de pagina"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr "GCR-overgang"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr "De grijscomponent-overgangssnelheid aanpassen"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr "GCR-ondergrens"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr "Ondergrens van grijscomponent-vermindering"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr "GCR-bovengrens"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr "Bovengrens van grijscomponent-vermindering"
 
 #: src/main/print-color.c:421
 msgid "LUT dump file"
-msgstr ""
+msgstr "LUT dumpbestand"
 
 #: src/main/print-color.c:422
 msgid "Dump file for LUT for external color adjustment"
-msgstr ""
+msgstr "Dumpbestand voor LUT voor externe kleuraanpassing"
 
 #: src/main/print-color.c:455 src/main/print-color.c:465
 #: src/main/print-color.c:473 src/main/print-color.c:481
@@ -947,77 +1154,77 @@ msgstr "Grijscomponent-verminderingskromme"
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionele Gutenprint-kleurconversie"
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Waarde moet ingesteld worden voor %s\n"
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' is geen juiste %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s moet liggen tussen %f en %f (is %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s moet liggen tussen %d en %d (is %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "grenzen van %s moeten liggen tussen %f en %f\n"
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s doorloop-modus moet zijn %s\n"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr "niet doorlopen (op de volgende regel)"
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr "doorlopen (op de volgende regel)"
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Onbekend type parameter %s (%d)\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s buiten bereik (waarde %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "Paginagrootte is ongeldig\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Bovenmarge mag niet minder dan %d zijn\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Linkermarge mag niet minder dan %d zijn\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr "Hoogte moet groter dan nul zijn\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr "Breedte moet groter dan nul zijn\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1026,7 +1233,7 @@ msgstr ""
 "Afbeelding is te breed voor de pagina: linkermarge is %d, breedte %d, "
 "rechterrand is %d\n"
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1035,391 +1242,431 @@ msgstr ""
 "Afbeelding is te lang voor de pagina: bovenmarge is %d, hoogte %d, onderrand "
 "is %d\n"
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr "Automatische printmodus"
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr "Basis uitvoeraanpassing"
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "Automatische printmodus"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "Printkwaliteit"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "Resolutie van de afdruk"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr "Verhoogde glans"
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr "Voeg glansverhoging toe"
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr "Inktsetje"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "Richting van het afdrukken"
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr "Geavanceerde aanpassing van uitvoer"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 "Richting van het afdrukken (unidirectioneel geeft hogere kwaliteit, echter "
 "langzamer)"
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr "Zonder randen"
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr "Afdrukken zonder randen"
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr "Interleave methode"
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr "Te gebruiken interleave patroon"
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr "Pas de puntgrootte aan"
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr "Pas de puntgrootte aan om de gewenste dichtheid te verkrijgen"
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr "Volgorde van uitvoer"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr "Uitlijnstappen"
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr "Uitlijnkeuzes"
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr "Inkt verandercommando"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr "Wissel uitlijnstappen af"
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr "Wissel de uitlijnkeuzes"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr "Ondersteunt pakketmodus"
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr "Ondersteunt D4-pakketmodus"
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
-msgstr ""
+msgstr "Heeft verwisselbare inktcartidges"
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
-msgstr ""
+msgstr "Heeft meervoudige keuzes in inktcartridges"
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr "Kanaalnamen"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr "Aantal raw-kanalen"
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr "Cyaankaart"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr "Pas de cyaankaart aan"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr "Magentakaart"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr "Pas de magentakaart aan"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr "Geelkaart"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr "Pas de geelkaart aan"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr "Blauwkaart"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr "Pas de blauwkaart aan"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+msgid "Orange Map"
+msgstr "Oranjekaart"
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the orange map"
+msgstr "Pas de oranjekaart aan"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr "Roodkaart"
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr "Pas de roodkaart aan"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "Hoeveelheid rood"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "Hoeveelheid blauw"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "Pas de hoeveelheid blauw aan"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+msgid "Orange Density"
+msgstr "Hoeveelheid oranje"
+
+#: src/main/print-escp2.c:488
+msgid "Adjust the orange density"
+msgstr "Pas de hoeveelheid oranje aan"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr "Pas het glansniveau aan"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
-msgstr ""
+msgstr "Kleine druppelgrootte"
 
-#: src/main/print-escp2.c:503
-#, fuzzy
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
-msgstr "CD-grootte (handmatig)"
+msgstr "Druppelgrootte 1 (klein)"
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
-msgstr ""
+msgstr "Middelgrootte druppelgrootte"
 
-#: src/main/print-escp2.c:511
-#, fuzzy
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
-msgstr "CD-grootte (handmatig)"
+msgstr "Druppelgrootte 2 (middel)"
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
-msgstr ""
+msgstr "Grote drupplegrootte"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
-msgstr ""
+msgstr "Druppelgrootte 3 (groot)"
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
-#, fuzzy
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Light Cyan Value"
-msgstr "Lichtcyaan"
+msgstr "Lichtcyaanwaarde"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
-#, fuzzy
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Light Cyan Density Scale"
-msgstr "Hoeveelheid cyaan"
+msgstr "Cyaanschaal"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
-#, fuzzy
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 msgid "Light Magenta Value"
-msgstr "Lichtmagenta"
+msgstr "Lichtmagentawaarde"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
-#, fuzzy
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 msgid "Light Magenta Density Scale"
-msgstr "Hoeveelheid magenta"
+msgstr "Magentaschaal"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
-#, fuzzy
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 msgid "Dark Yellow Value"
-msgstr "Donkergeel"
+msgstr "Donkergeelwaarde"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr "Donkergeel overgang"
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
-#, fuzzy
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 msgid "Dark Yellow Density Scale"
-msgstr "Heoveelheid geel"
+msgstr "Geelschaal"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
-#, fuzzy
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 msgid "Gray Value"
-msgstr "Grijsschaal"
+msgstr "Grijswaarde"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 msgstr "Grijs overgang"
 
-#: 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 msgid "Gray Density Scale"
 msgstr "Grijsschaal"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
-#, fuzzy
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
-msgstr "Lichtgrijs overgang"
+msgstr "Lichtgrijswaarde"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 msgstr "Lichtgrijs overgang"
 
-#: 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
-msgstr "Lichtgrijs overgang"
+msgstr "Lichtgrijsschaal"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
-#, fuzzy
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
-msgstr "Donkergrijs overgang"
+msgstr "Donkergrijswaarde"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr "Donkergrijs overgang"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
-#, fuzzy
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
-msgstr "Donkergrijs overgang"
+msgstr "Donkergrijsschaal"
 
-#: src/main/print-escp2.c:694
-#, fuzzy
+#: src/main/print-escp2.c:695
 msgid "Mid Gray Value"
-msgstr "Grijsschaal"
+msgstr "Middelgrijswaarde"
 
-#: src/main/print-escp2.c:695
-#, fuzzy
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
-msgstr "Middelgrijs overgang"
+msgstr "Middelgrijswaarde"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:710
-#, fuzzy
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
-msgstr "Middelgrijs overgang"
+msgstr "Middelgrijsschaal"
 
-#: src/main/print-escp2.c:711
-#, fuzzy
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
-msgstr "Middelgrijs overgang"
+msgstr "Middelgrijsschaal"
+
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr "Droogtijd per pagina"
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr "Stel droogtijd per pagina in"
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr "Droogtijd per scan"
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr "Stel droogtijd per scan in"
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr "Minimale droogtijd per scan"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr "Stel minimale droogtijd per scan in"
+
+#: src/main/print-escp2.c:799
+msgid "Paper Thickness"
+msgstr "Papierdikte"
+
+#: src/main/print-escp2.c:800
+msgid "Set printer paper thickness"
+msgstr "Stel de papierdikte van de printer in"
+
+#: src/main/print-escp2.c:807
+msgid "Vacuum Intensity"
+msgstr "Zuigkracht"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr "Stel zuigkracht in"
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr "Invoer-volgorde"
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr "Stel de invoer-volgorde in (printerspecifiek)"
+
+#: src/main/print-escp2.c:823
+msgid "Print Method"
+msgstr "Wijze van printen"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr "Stel de wijze van printen in (printerspecifiek)"
+
+#: src/main/print-escp2.c:831
+msgid "Platen Gap"
+msgstr "Kophoogte"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr "Stel kophoogte in (printerspecifiek)"
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr "Invoerafstelling"
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr "Stel de invoerafstelling in (0,01% units)"
+
+#: src/main/print-escp2.c:1964
 msgid "Full Manual Control"
 msgstr "Volledig handmatige controle"
 
-#: src/main/print-escp2.c:2001
+#: src/main/print-escp2.c:1966
 msgid "Automatic Setting Control"
 msgstr "Automatische controle op instellingen"
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Handmatige controle"
-
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standaard"
-
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr "Bidirectioneel"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr "Unidirectioneel"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr "Afwisselend opvullen"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr "Oplopend vullen"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr "Aflopend vullen"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr "Dubbel oplopend"
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vermijden van naaste buur"
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr "Korte zijde (omslaan)"
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print opties niet geverifiëerd; kan niet printen.\n"
 
@@ -1472,129 +1719,356 @@ msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
-msgstr "Vier kleuren standaard"
+msgstr "Vierkleuren standaard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
-msgstr "Drie kleuren composiet"
+msgstr "Driekleuren composiet"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
-msgstr "Zes kleuren foto"
+msgstr "Zeskleuren foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
-msgstr "Vijf kleuren foto composiet"
-
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+msgstr "Vijfkleuren foto composiet"
+
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Blanco papier"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Glanzende laag"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Transparanten"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Enveloppen"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Overige"
 
@@ -1610,170 +2084,193 @@ msgstr "Handmatig met pauze"
 msgid "Manual without Pause"
 msgstr "Handmatig zonder pauze"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr "Gecoat"
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr "Geen"
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr "Glanzend"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr "Oppervlaktestructuur"
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr "Laagjespatroon"
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "Pas de cyaanbalans aan"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "Pas de magentabalans aan"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "Pas de geelbalans aan"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "Zwartbalans"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "Pas de zwartbalans aan"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Blanco"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Zwaar"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
-msgstr "Eerste klas"
+msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Glanzende foto"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Transparant"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Sneldrogend foto"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
-msgstr "Sneldrogend transparant"
+msgstr "Sneldrogende transparant"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Handmatig"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
-msgstr ""
+msgstr "Lade 1 - Verplaatsbare geleiders"
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Lade 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
-msgstr ""
+msgstr "Lade 2 - Verplaatsbare geleiders"
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Lade 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
-msgstr ""
+msgstr "Lade 3 - Verplaatsbare geleiders"
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Lade 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
-msgstr ""
+msgstr "Lade 4 - Verplaatsbare geleiders"
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Lade 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Draagbare Sheet Feeder"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Desktop Sheet Feeder"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Lade"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Optionele Bron"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Automatisch Selecteren"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monochrome"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr "Proefdruk"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr "Hoog"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Kleur + Zwarte patronen"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Kleur + Foto patronen"
 
@@ -1781,6506 +2278,9763 @@ msgstr "Kleur + Foto patronen"
 msgid "PPDFile"
 msgstr "PPD-bestand"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "PPD-bestand"
 
-#: src/main/print-ps.c:74
-#, fuzzy
+#: src/main/print-ps.c:80
 msgid "Model Name"
-msgstr "Kanaalnamen"
+msgstr "Modelnaam"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
-msgstr ""
+msgstr "Modelnaam in PPD-bestand"
+
+#: src/main/print-ps.c:316
+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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
 
-#: src/main/print-raw.c:223
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Gebruiker"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 "Afmeting van afbeelding moet overeenkomen met de afmetingen van het papier"
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Grijsschaal met twee waarden"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr "Snel en zuinig"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
-msgstr "Grijsschaal met drie waarden"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr "Zuinig"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Viertonig"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
+msgstr "Super Photo"
 
-#: src/main/escp2-channels.c:1466
-#, fuzzy
-msgid "Four Color Photo"
-msgstr "Zes kleuren foto"
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
+msgstr "Ultra Photo"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Zes kleuren verbeterde samenstelling"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr "Het best"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Zevenkleuren foto"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Tekst"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Zeven kleuren verbeterd"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Grafisch"
 
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
-msgstr "Achtkleuren foto"
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Gemengd tekst en grafisch"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "Enkelkleur 'raw'"
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Foto"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Enkelkleur 'raw' verbeterde glans"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Lijntekening"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "Tweekleuren 'raw'"
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Pagina"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
-msgstr "Driekleuren 'raw'"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Job"
 
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
-msgstr "Driekleuren 'raw' glanzend"
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Afbeeldingstype"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "Vierkleuren 'raw'"
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Type afbeelding bezig op de printer"
 
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
-msgstr "Vierkleuren 'raw' glanzend"
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Jobmodus"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
-msgstr "Vijfkleuren 'raw'"
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Job versus paginamodus"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Zeskleuren 'raw'"
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Paginanummer"
 
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Zeskleuren verbeterde glans 'raw'"
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Paginanummer"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Zevenkleuren 'raw'"
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Type kromme"
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Zevenkleuren verbeterde glans 'raw'"
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "Bij een lineaire kromme, spline geïnterpoleerd of vrije-vorm"
 
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
-msgstr "Achtkleuren 'raw'"
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Kleinste X"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
-msgstr "EPSON standaard inkt"
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Kleinst mogelijke waarde voor X"
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
-msgstr "UltraChrome Photo Black"
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Grootste X"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
-msgstr "UltraChrome Matte Black"
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Grootst mogelijke waarde voor X"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Kleinste Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Kleinst mogelijke waarde van Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Grootste Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Grootst mogelijke waarde van Y"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gamma-waarde"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Inch"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Stel de basis-meeteenheid in op inches"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Stel de basis-meeteenheid in op centimeter"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Punten"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Stel de basis-meeteenheid in op punten (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 "Stel de basis-meeteenheid in op millimeter"
+
+#: 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 "Stel de basis-meeteenheid in op pica (1/12\")"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Kleuruitvoer"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Print in grijstinten met zwarte inkt"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Standaard commando"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Gebruik het standaard printcommando"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Fabrikaat specifiek commando"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Gebruik het fabrikaat specifieke commando"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Bestand"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Afdrukken naar een bestand"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Kromme aanpassen..."
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Stel standaard in"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Herstel het vorige"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+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 "Annuleren"
+
+#: src/gutenprintui2/panel.c:642
+msgid "Select File..."
+msgstr "Bestand selecteren..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr "Opnieuw instellen"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Print v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Info"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Afdrukken en\n"
+"instellingen opslaan"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Instellingen\n"
+"opslaan"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Afdrukken"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Voorbeeld"
+
+#: 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 ""
+"Plaats de afbeelding op de pagina.\n"
+"Klik en sleep met de eerste knop om de afbeelding te plaatsen.\n"
+"Klik en sleep met de tweede knop om de afbeelding met een fijnere "
+"nauwkeurigheid te plaatsen; elke eenheid beweging verplaatst deze één punt "
+"(1/72\")\n"
+"Klik en sleep met de derde (middelste) knop om de afbeelding in eenheden van "
+"zijn grootte te verplaatsen.\n"
+"Bij het ingedrukt houden van de Shift-toets tijdens klikken en slepen "
+"beperkt de beweging tot horizontaal of verticaal.\n"
+"Als u op een andere knop klikt bij het slepen, dan keert de afbeelding terug "
+"naar zijn oorspronkelijke plaats."
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Papierafmetingen"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Toon alle papierafmetingen"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Afmetingen"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Breedte: "
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Breedte van het papier waarop je wenst te printen"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Hoogte: "
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Hoogte van het papier waarop je wenst te printen"
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Automatische papierafmetingen"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Aantal kopieën"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Kies het aantal af te drukken kopieën; een waarde tussen 1 en 100"
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Positie van afbeelding"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automatisch"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Portret"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Landschap"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Ondersteboven"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Seascape"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Kies de orientatie: portret, landschap, ondersteboven of seascape "
+"(ondersteboven landschap)"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Oriëntatie:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Links:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Afstand vanaf de linkerkant van het papier tot de afdruk"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Rechts:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr ""
+"Afstand vanaf de linkerkant van het papier tot de rechterkant van de afdruk"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Afstand vanaf de rechterkant van het papier tot de afdruk"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Boven:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Onder:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr ""
+"Afstand vanaf de bovenkant van het papier tot de onderkant van de afbeelding"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Afstand vanaf de onderkant van het papier tot de afdruk"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Midden X:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Horzontaal"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centreer het plaatje horizontaal op het papier"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Beide"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centreer het plaatje op het papier"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Verticaal"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centreer het plaatje verticaal op het papier"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Stel Printer in"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Printermerk:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Selecteer het merk van uw printer"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Printer model:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Selecteer jouw printer model"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD Bestand:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Bladeren"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Kies de juiste PPD bestandsnaam voor jouw printer"
+
+#: 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 ""
+"Selecteer de naam van de uitvoerrij (niet het type, of model, of printer) "
+"die u wilt uitprinten"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Printerrij:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Geef het juiste commando om naar uw printer te printen. "
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Voer de bestandsnaam in waarnaar geprint moet worden. "
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "Bestand waar print naar toe moet"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Afdrukken naar bestand"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Stel nieuwe printer in"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Printernaam:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Voer de naam in van de logische printer"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "Info over Gutenprint "
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Gutenprint versie"
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Printerinstellingen"
+
+#: 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 ""
+"Selecteer de naam van de printer (Niet het type, of model, of printer) "
+"waarna je wenst te printen"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Instellen Printer..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
+"deze printer af te drukken."
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Nieuwe Printer..."
+
+#: 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 ""
+"Definieer een logische printer. Deze kan gebruikt worden om een verzameling "
+"van instellingen die u bewaren wilt voor toekomstig gebruik."
+
+#: src/gutenprintui2/panel.c:2150
+msgid "Set Printer Option Defaults"
+msgstr "Stel standaardwaarden van printeropties in"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr "Stel alle printeropties in op hun standaardwaarden"
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Afbeeldingsgrootte"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Schaal:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Stel de schaal (afmeting) in van het plaatje"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Schalen met:"
+
+#: 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 ""
+"Moet schaling gemeten worden in het percentage van de beschikbare "
+"paginagrootte of het aantal punten per inch"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Procent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Schaal de afdruk tot de afmeting van de pagina"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Schaal de afdruk tot het aantal punten per inch"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Geef de breedte van de afdruk"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Geef de hoogte van de afdruk"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Gebruik de originele\n"
+"grootte van de afbeelding"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Stel de afdrukgrootte gelijk aan de grootte van de afbeelding"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Aanpassing van afdrukkleur"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Stel standaardwaarden in"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Sluiten"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Afdruk voorvertoning"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "Toon uitvoerkanalen:"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Uitvoer"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Type uitvoer:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Kies het gewenste type uitvoer"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Past uitvoer aan..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Pas de kleurbalans, helderheid, contrast, verzadiging en ruis-algoritme aan"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Afmeting eenheden:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Eenheden:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Kies de basiseenheid van afmeting voor het afdrukken"
+
+#: 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 "Printer"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Standaard printer)"
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr "Printermogelijkheden"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr "Controle op uitvoer"
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr "Gezamelijk"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr "Extra 1"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr "Extra 2"
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr "Extra 3"
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr "Extra 4"
+
+#: src/cups/genppd.c:155
+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
+msgid "English"
+msgstr "Engels"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+msgid "Media Size"
+msgstr "Afmetingen van het medium"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+msgid "Color Model"
+msgstr "Kleurmodel"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+msgid "Inverted Grayscale"
+msgstr "Omgekeerde grijsschaal"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+msgid "RGB Color"
+msgstr "RGB-kleur"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY-kleur"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr "Kleurprecisie"
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr "Omkeren"
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr "Dubbelzijdig printen"
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+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:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr "Verkleinen (de gehele pagina afdrukken)"
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr "Afsnijden (behoud de afmetingen)"
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr "Vergroot (gebruik de gehele pagina)"
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "Nee"
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr "Waarde"
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr "Fijnafstelling"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil versie"
+
+#: 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-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Dit programma is vrije software; u mag het verspreiden en/of wijzigen\n"
+"onder de termen van de GNU General Public License zoals gepubliceerd door de "
+"Free\n"
+"Software Foundation; ofwel versie 2 van de licentie, of (naar vrije keuze)\n"
+"elke latere versie.\n"
+"\n"
+"Dit programma is verspreid in de hoop dat het bruikbaar zou zijn, maar\n"
+"ZONDER ENIGE GARANTIE; zelfs zonder de impliete garantie van "
+"VERKOOPBAARHEID\n"
+"of GESCHKT VOOR EEN BEPAALD DOEL.  Zie de GNU General Public License\n"
+"voor meer details.\n"
+"\n"
+"U zou een kopie hebben moeten ontvangen van de GNU General Public License\n"
+"samen met dit programma; zo niet, schrijf dan naar de 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 ""
+"Gebruik: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                  [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                  [-C choices] [-p patterns]\n"
+"Doe onderhoud aan de EPSON Stylus (R) printers.\n"
+"Voorbeelden: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"             escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"  Commando's:\n"
+"    -c|--clean-head    Maak de printkop schoon.\n"
+"    -n|--nozzle-check  Print een nozzle testpatroon.\n"
+"                       Vuile of verstopte nozzles vertonen zich als gaten in "
+"het\n"
+"                       patroon.  Als u een gat ziet dan moet u de printkop\n"
+"                       schoonmaken.\n"
+"    -a|--align-head    Lijn de printkop uit.  VOORZICHTIG: Verkeerd gebruik "
+"van dit\n"
+"                       programma kan resulteren in een slechte "
+"printkwaliteit en/of\n"
+"                       beschadiging van de printer.\n"
+"    -s|--status        Haal de printerstatus op.\n"
+"    -i|--ink-level     Toon de inktniveaus van de printer.  Dit vereist\n"
+"                       lees/schrijf-toegang tot het raw-printerapparaat.\n"
+"    -e|--extended-ink-info     Toon de uitgebreide inktinformatie van de\n"
+"                       printer.  Dit vereist lees/schrijf-toegang tot het\n"
+"                       raw-printerapparaat.\n"
+"    -d|--identify      Vraag het merk en model van de printer. Dit vereist\n"
+"                       lees/schrijf-toegang tot het raw-printerapparaat.\n"
+"    -l|--license       Toon de licentie en garantie-bepalingen van dit "
+"programma.\n"
+"    -M|--list-models   Toon een lijst van de beschikbare printermodellen.\n"
+"    -h|--help          Toon dit hulpbericht.\n"
+"  Opties:\n"
+"    -P|--printer-name  Specificeer de naam van de printerqueue.\n"
+"                       Standaard is de standaard systeemprinter.\n"
+"    -r|--raw-device    Specificeer de naam van het apparaat waar direct "
+"naar\n"
+"                       geschreven moet worden i.p.v. via een pinterqueue.\n"
+"    -m|--model         Specificeer het printermodel.\n"
+"    -u|--new           De printer is een nieuwe printer (Stylus Color 740 "
+"of\n"
+"                       nieuwer).  Alleen noodzakelijk bij een niet-raw "
+"apparaat\n"
+"                       of wanneer het model niet gespecificeerd is.\n"
+"    -q|--quiet         Onderdruk de banner.\n"
+"    -S|--short-name    Toon de korte naam van de printer met --identify.\n"
+"    -C|--choices       Specificeer het aantal patroonkeuzes voor de "
+"uitlijning\n"
+"    -p|--patterns      Specificeer het aantal patroonsets voor de "
+"uitlijning\n"
+
+#: src/escputil/escputil.c: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 ""
+"Gebruik: escputil [OPTIES] [COMMANDO]\n"
+"Gebruik: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Doe onderhoud aan de EPSON Stylus (R) printers.\n"
+"Voorbeeld: escputil -i -r /dev/usb/lp0\n"
+"           escputil -c -u -P MyQueue\n"
+"\n"
+"  Commando's:\n"
+"    -c Maak de printkop schoon.\n"
+"    -n Print een spuitgaatjes testpatroon.\n"
+"          Vuile of verstopte spuitgaatjes komen te voorschijn als gaten in "
+"het\n"
+"          patroon.  Als er zo'n gat is, dan moet de printkop schoongemaakt\n"
+"          worden.\n"
+"    -a Lijn de printkop uit.  VOORZICHTIG: Misbruik van dit\n"
+"          programma kan een slechte printkwaliteit oplevren\n"
+"          en/of de printer beschadigen.\n"
+"    -s Toon de status van de printer.\n"
+"    -i Toon de inktniveau's van de printer.  Dit vereist\n"
+"          lees/schrijftoegang tot het raw-printer-device.\n"
+"    -e Toon de uitgebreide inktinformatie van de printer.\n"
+"          Alleen voor de R800-printer en gelijken. Dit vereist\n"
+"          lees/schrijftoegang tot het raw-printer-device.\n"
+"    -d Vraag het merk en model van de printer op.  Dit\n"
+"          vereist lees/schrijftoegang tot het raw-printer-device.\n"
+"    -l Toon de licentie/garantie bepalingen van dit programma.\n"
+"    -M Toon de beschikbare printermodellen.\n"
+"    -h Toon deze hulpboodschap.\n"
+"  Opties:\n"
+"    -P Specificeer de naam van de betrokken printerqueue.\n"
+"          Standaard is de standaard systeemprinter.\n"
+"    -r Specificeer de naae van het apparaat waar direct naar geschreven\n"
+"          moet worden ga niet via een printerqueue.\n"
+"    -u De printer is een nieuwe printer (Stylus Color 740 of nieuwer).\n"
+"          Alleen nodig als niet een raw-device wordt gebruikt.\n"
+"    -q Onderdruk de banner.\n"
+"    -S Print de korte naam van de printer bij -d.\n"
+"    -m Specificeer het preciese printermodel voor het uitlijnen van de kop.\n"
+"    -C Specificeer het aantal keuzes in patronen voor de uitlijning\n"
+"    -p Specificeer het aantal sets patronen voor uitlijning\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Je mag maar een printer of raw apparaat specificeren."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "U mag maar een printermodel specificeren"
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Aantal keuzes voor uitlijning moet tenminste 1 zijn."
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Aantal doorgangen voor uitlijning moet tenminste 1 zijn."
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Onbekende optie %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Gebruik: %s [OPTIES] commando\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Geef `%s --help' voor meer informatie.\n"
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Geef `%s -h' voor meer informatie.\n"
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Kan apparaat %s:%s niet openen\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Kan niet printen op printer %s met %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Kan de opdracht niet versturen naar de printer\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Lezen van de printer duurt te lang\n"
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Kan niet lezen van %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr "Specificeer een raw-apparaat\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Kan %s niet openen lezen/schrijven: %s\n"
+
+#: src/escputil/escputil.c:783
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Onbekende printer %s!\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Kan niet schrijven naar %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Kan niet schrijven naar %s:%s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Kan printer type niet vaststellen.\n"
+"Gebruik -m om uw printermodel te specificeren.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr "Fotozwart"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
-msgstr "Matzwart"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr "Lichtcyaan"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr "Lichtmagenta"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr "Grijs"
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
-msgstr "Donkergeel"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
+msgstr "Matzwart"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr "Glansverbeteraar"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr "Lichtgrijs"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Blanco papier snellader"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+msgid "Orange"
+msgstr "Oranje"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr "Status: Fout\n"
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Status: Zelfstandig aan het printen\n"
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Status: Bezig\n"
+
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Status: In de wacht\n"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Status: Idle\n"
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Status: In pauze\n"
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Status: Aan het schoonmaken\n"
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Status: Fabrieksinstelling\n"
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Status: Aan het afsluiten\n"
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Status: Onbekend (%d)\n"
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Fout: fatale fout\n"
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Fout: Het andere interface is gekozen\n"
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Fout: Deksel is open\n"
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Fout: Papier zit vast\n"
+
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Fout: Geen inkt\n"
+
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Fout: geen papier\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Fout: Een of andere papierfout\n"
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr "Fout: Overflow met onderhoudscartidge\n"
+
+#: src/escputil/escputil.c:1084
+#, 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:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Fout: in tweezijdige doorvoer\n"
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+"Fout: Inktcartridgehendel losgezet\n"
+"\n"
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Fout: Onherstelbare fout in snij-instrument\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Fout: Herstelbaar snij-instrument zit vast\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr "Fout: Geen onderhoudscartridge aanwezig\n"
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Fout: Achterdeksel is open\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Fout: Geen CD-lade aanwezig\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Fout: Laden van een kaart gaat fout\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Fout: Ladedeksel is open\n"
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Fout: Deksel van onderhoudscartidge is open\n"
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr "Fout: Deksel aan de voorkant is open\n"
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Fout: Onderhoudsverzoek\n"
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Fout: Onbekend (%d)\n"
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Waarschuwing: %s inkt staat laag\n"
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Waarschuwing: Inkt in kanaal %d staat laag\n"
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr "Waarschuwing: %s schoonmaken uitgezet\n"
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr "Waarschuwing: Kanaal %d schoonmaken\n"
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr "Waarschuwing: Onderhoudscartridge bijna vol\n"
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr "Waarschuwing: Onderhoudsverzoek in behandeling\n"
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Waarschuwing: Onbekend (%d)\n"
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Spuitmondjes zelftest\n"
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Inktniveau's:\n"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Inktkleur"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Percentage nog aanwezig"
+
+#: src/escputil/escputil.c:1298
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr "Printernaam: %s\n"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr "Jobnaam: "
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr "inktniveau's"
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "status"
+
+#: src/escputil/escputil.c:1393
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Verkrijgen van %s vereist een 'raw' apparaat.\n"
+
+#: src/escputil/escputil.c:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr "Inktcartridge"
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr "Nummer van onderdeel"
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "Datum"
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Kan het printermodel niet identificeren.\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Bezig met het schoonmaken van de koppen..\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Leest u alstublieft deze instructies nauwkeurig door, voordat u verder "
+"gaat.\n"
+"\n"
+"U kunt met deze applicatie de koppen van uw Epson Stylus inkjet\n"
+"printer uitlijnen. Onjuist gebruik van deze applicatie kan leiden tot\n"
+"verlies in kwaliteit en het kan zelfs uw printer beschadigen. Deze "
+"applicatie\n"
+"is niet gecontroleerd op fouten door Seiko Epson, en wordt geleverd zonder\n"
+"enige vorm van garantie. het gebruik is volledig op eigen risico.\n"
+"\n"
+"Het programma zal %d patronen afdrukken. Elk patroon lijkt erg op de ander.\n"
+"Het patroon bestaat uit een serie paren van verticale lijnen die elkaar "
+"overlappen.\n"
+"Onder elk paar met lijnen staat een nummer tussen %d en %d.\n"
+"\n"
+"Wanneer u de lijnen bekijkt, moet u zoeken naar het paar die het beste is "
+"uitgelijnd,\n"
+"met andere woorden, diegen die samen  de beste enkele lijn vormen.\n"
+"Het gebruik van een loep of vergrootglas wordt aangeraden voor de\n"
+"meest critische inspectie. Er wordt ook aangeraden om een goede kwaliteit\n"
+"papier te gebruiken, zodat de lijnen mooi strak zijn, en niet over het "
+"papier\n"
+"uitvloeien. Wanneer u het nummer heeft uitgekozen, plaats dan het papier "
+"weer\n"
+"terug erug in de printer voordat u het nummer intypt.\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"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Lees deze instructies heel goed voor, voordat u doorgaat.\n"
+"\n"
+"Dit programma laat u de printkop van uw Epson Stylus inktjetprinter\n"
+"uitlijnen. Als u dit programma verkeerd gebruikt kan de printkwaliteit naar\n"
+"beneden gaan en mogelijk uw printer beschadigen. Dit programma is niet\n"
+"door Seiko Epson gecontroleerd op fouten, en wordt zonder enige garantie\n"
+"ter beschikking gesteld. Het volledige risico van het gebruik van dit\n"
+" programma ligt bij u.\n"
+"\n"
+"Dit programma print een testpatroon dat bestaat uit een aantal paren van\n"
+"verticale lijnen die elkaar overlappen. Onder elk paar lijnen staat een "
+"nummer\n"
+"tussen de %d en %d.\n"
+"\n"
+"Als u deze paren bekijkt, zult u een paar lijnen vinden die het beste zijn\n"
+"uitgelijnd, hetgeen betekent dat deze lijnen het beste samen één lijn "
+"vormen.\n"
+"Bekijk de lijnen zeer zorgvuldig om het beste paar uit te zoeken. Het "
+"gebruik\n"
+"van een loupe of vergrootglas is aanbevolen voor de meest kritische\n"
+"inspectie. Het is ook aan te raden om voor deze test een goede kwaliteit "
+"papier\n"
+"te gebruiken zodat de lijnen goed gevormd zijn en niet door het papier "
+"drukken.\n"
+"Nadat u het nummer hebt gekozen, dat het beste overeenkomt, plaats u het\n"
+"papier terug in de printer voordat u het nummer intikt.\n"
+"\n"
+"Nadat het het uitlijnen nog eens gedaan is, zal het nog een keer geprint "
+"worden\n"
+"U zou moeten vinden dat het middelste paar (#%d van de %d) het beste is.\n"
+"U krijgt dan de mogelijkheid om het resultaat in de printer op te slaan(s),\n"
+"het proces te he(r)halen of te stoppen zonder op te slaan(q). Stoppen zal "
+"niet\n"
+"de vorige instellingen terugzetten, maar de printer aan en uit zetten zal "
+"dat\n"
+"wel doen. Als u stopt, zult u het hele proces opnieuw moeten doorlopen\n"
+"om de resultaten op te slaan. Het is essentieel dat u de printer niet "
+"uitzet\n"
+"tijdens deze procedure.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr "Bezig te stoppen\n"
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"U dient de uiteindelijke uitvoer zeer zorgvuldig te bekijken om er\n"
+"zeker van te zijn dat de printer juist in uitgelijnd. U kunt nu:\n"
+"  (s)ave, bewaar het resultaat in de printer,\n"
+"  (q)uit, stop zonder het resultaat te bewaren, of\n"
+"  (r)epeat, herhaal het gehele proces vanaf het begin.\n"
+"U krijgt daarna de vraag uw keuze te bevestigen.\n"
+"Wat wilt u doen (s,q, r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+"Graag bevestiging dat u wilt stoppen zonder te bewaren door opnieuw 'q' te "
+"typen:\n"
+
+#: src/escputil/escputil.c:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Graag bevestiging dat u het uitlijnproces wilt herhalen door\n"
+"het typen van een 'r':\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Herhaal de uitlijnprocedure.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Dit verandert de configuratie van uw printer permanent.\n"
+"WAARSCHUWING: deze procedure is niet goedgekeurd door Seiko Epson en\n"
+"het zou uw printer kunnen beschadigen. Doorgaan?\n"
+"Graag bevestigen door 's' opnieuw in te typen om de instellingen\n"
+"in uw printer te bewaren:\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Bezig met wegschrijven van instellingen..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "mislukt!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Uw instellingen werden niet succesvol weggeschreven. U moet de\n"
+"uitlijnprocedure herhalen.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "gelukt!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Onbekend commando.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Laatste commando is niet bevestigd.\n"
+
+#: src/escputil/escputil.c:1950
+#, 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 ""
+"Deze procedure neemt aan dat uw printer een %s is.\n"
+"Als dit niet uw printermodel is, type dan nu control-C en\n"
+"kies uw echte printermodel.\n"
+"\n"
+"Zet een vel papier in uw printer om te beginnen met de\n"
+"procedure voor het uitlijnen van de koppen.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Druk op enter om door te gaan > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Stap #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Voer een nieuw vel papier in.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Nummer valt buiten bereik!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Begrijp niet wat u zonjuist ingetikt hebt!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Probeert de uitlijning in te stellen..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "gelukt.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Kijk alstublief na of de uitlijning klopt. Kijk, nadat het "
+"uitlijningspatroon\n"
+"weer opnieuw is afgedrukt, of het beste patroon voor elk\n"
+"lijnpatroon %d is. Als dat niet zo is dan zult u de procedure moeten\n"
+"herhalen om de beste kwaliteit te krijgen.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Fout in de invoer\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Bezig met afdrukken..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr "EPSON standaard inkt"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+msgid "Bright White Paper"
+msgstr "Helder wit papier"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Briefkaart"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "Backlight film"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 msgid "Matte Paper Heavyweight"
 msgstr "Zwaar mat papier"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr "Mat premium presentatiepapier"
+
+#: src/xml/xmli18n-tmp.h:27
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premium glanzend fotopapier 170 wt"
+
+#: src/xml/xmli18n-tmp.h:29
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premium glanzend fotopapier 250 wt"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+msgid "Ultra Glossy Photo Paper"
+msgstr "Extra glanzend fotopapier"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium halfglanzend fotopapier"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:35
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Premium halfglanzend fotopapier 170 wt"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Premium halfglanzend fotopapier 250 wt"
+
+#: src/xml/xmli18n-tmp.h:41
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Premium luster fotopapier 250 wt"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Ultra Premium Photo Paper Luster"
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 msgid "ColorLife Paper"
 msgstr "ColorLife papier"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Viertonig"
+
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Blanco papier snellader"
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
 msgid "Archival Matte Paper"
 msgstr "Archief mat papier"
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
 msgid "Watercolor Paper - Radiant White"
 msgstr "Waterverfpapier - stralend wit"
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Rolinvoer"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr "Aanvoer vanaf rol (snij elke pagina af)"
-
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr "Aanvoer vanaf rol (niet afsnijden)"
-
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "Handmatige toevoer"
-
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "Afdrukken naar CD"
-
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
-msgstr "Handmatige papiergeleider"
-
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-msgid "Manual Feed (Front)"
-msgstr "Handmatige toevoer (voorzijde)"
-
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
-msgstr "Lade aan achterzijde"
-
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr "Lade aan voorzijde"
-
-#: src/main/escp2-papers.c:1988
-msgid "Photo Board"
-msgstr "Fotobord"
-
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr "Lade 1 voor vellen"
-
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
-msgstr "Lade 2 voor vellen"
-
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
-msgstr "Automatisch selecteren van vellen"
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
+msgstr "UltraChrome Photo Black"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
-msgstr "Handmatig selecteren"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr "UltraChrome Matte Black"
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI Fast Economy"
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 DPI Economy"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr "180 DPI Economy"
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 DPI Draft"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
-msgstr "360 x 240 DPI Draft"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 DPI hoge kwaliteit"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI verbeterd"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr "720 DPI hoge kwaliteit"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
+msgstr "360 x 120 DPI Economy"
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 DPI hoogste kwaliteit"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr "360 x 240 DPI Draft"
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
-msgstr "720 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr "720 DPI hoge kwaliteit"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 7200 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI getransponeerd"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 DPI getransponeerd"
-
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
-msgstr "5760 x 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr "Donkergeel"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr "Aan"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI getransponeerd"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
-msgstr "Interleave"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI verbeterd"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr "Volledige overlap"
+#: src/xml/xmli18n-tmp.h:2922
+msgid "Black 1"
+msgstr "Zwart 1"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
-msgstr "Viermaal een doorgang"
+#: src/xml/xmli18n-tmp.h:2923
+msgid "Black 2"
+msgstr "Zwart 2"
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
-msgstr "Volledige overlap 2"
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+msgid "360 DPI Enhanced"
+msgstr "360 DPI verbeterd"
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
-msgstr "Interleave 2"
+#: src/xml/xmli18n-tmp.h:2959
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
-msgstr "Achtmaal doorgang"
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
+msgstr "Lade aan achterzijde"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Snel en zuinig"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
+msgstr "Lade aan voorzijde"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Zuinig"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "Handmatige toevoer"
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Proefdruk"
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "Afdrukken naar CD"
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
-msgstr "Hoog"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr "Aanvoer vanaf rol (snij elke pagina af)"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Foto"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
+msgstr "Aanvoer vanaf rol (niet afsnijden)"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super Photo"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Rolinvoer"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra Photo"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
+msgstr "Handmatige papiergeleider"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr "Het best"
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+msgid "Manual Feed (Front)"
+msgstr "Handmatige toevoer (voorzijde)"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr "Tekst"
+#: src/xml/xmli18n-tmp.h:3104
+msgid "Photo Board"
+msgstr "Fotobord"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr "Grafisch"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr "Lade 1 voor vellen"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr "Gemengd tekst en grafisch"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr "Lade 2 voor vellen"
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "Foto"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
+msgstr "Automatisch selecteren van vellen"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Lijntekening"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr "Handmatig selecteren"
 
-#: src/main/generic-options.c:55
-msgid "Page"
-msgstr "Pagina"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "Enkelkleur 'raw'"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr "Job"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
+msgstr "Driekleuren 'raw'"
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
-msgstr "Afbeeldingstype"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "Vierkleuren 'raw'"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
-msgstr "Type afbeelding bezig op de printer"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
+msgstr "Vijfkleuren 'raw'"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
-msgstr "Jobmodus"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Zeskleuren 'raw'"
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
-msgstr "Job versus paginamodus"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Enkelkleur 'raw' verbeterde glans"
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
-msgstr "Paginanummer"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
+msgstr "Driekleuren 'raw' glanzend"
 
-#: src/main/generic-options.c:81
-msgid "Page number"
-msgstr "Paginanummer"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
+msgstr "Vierkleuren 'raw' glanzend"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Zeskleuren verbeterde glans 'raw'"
+
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Zevenkleuren verbeterde glans 'raw'"
+
+#: src/xml/xmli18n-tmp.h:3210
+msgid "Default Black"
+msgstr "Standaard zwart"
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Zevenkleuren foto"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Zeskleuren verbeterde samenstelling"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Zevenkleuren 'raw'"
+
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Grijsschaal met twee waarden"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "Tweekleuren 'raw'"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr "Achtkleuren foto"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr "Achtkleuren 'raw'"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+msgid "Four Color Photo"
+msgstr "Vierkleuren foto"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
+msgstr "Interleave"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr "Volledige overlap"
+
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr "Viermaal een doorgang"
+
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr "Volledige overlap 2"
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr "Interleave 2"
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr "Achtmaal doorgang"
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr "Aan"
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
-msgstr ""
+msgstr "3 1/2 x5"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapier (afscheurranden)"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3658
 msgid "C0 landscape"
-msgstr "Landschap"
+msgstr "C0-landschap"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3660
 msgid "C1 landscape"
-msgstr "Landschap"
+msgstr "C1-landschap"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3662
 msgid "C2 landscape"
-msgstr "Landschap"
+msgstr "C2-landschap"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3664
 msgid "C3 landscape"
-msgstr "Landschap"
+msgstr "C3-landschap"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3666
 msgid "C4 landscape"
-msgstr "Landschap"
+msgstr "C4-landschap"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3668
 msgid "C5 landscape"
-msgstr "Landschap"
+msgstr "C5-landschap"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3670
 msgid "B6-C4 landscape"
-msgstr "Landschap"
+msgstr "B6-C4-landschap"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3672
 msgid "C6 landscape"
-msgstr "Landschap"
+msgstr "C6-landschap"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3674
 msgid "DL landscape"
-msgstr "Landschap"
+msgstr "DL-landschap"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3676
 msgid "C7-6 landscape"
-msgstr "Landschap"
+msgstr "C7-6-landschap"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3678
 msgid "C7 landscape"
-msgstr "Landschap"
+msgstr "C7-landschap"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3680
 msgid "C8 landscape"
-msgstr "Landschap"
+msgstr "C8-landschap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3682
 msgid "C9 landscape"
-msgstr "Landschap"
+msgstr "C9-landschap"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3684
 msgid "C10 landscape"
-msgstr "Landschap"
+msgstr "C10-landschap"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr "ArchA getransponeerd"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr "ArchB getransponeerd"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr "ArchC getransponeerd"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr "ArchD getransponeerd"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr "ArchE getransponeerd"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Smalle paperback"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Penguin smalle paperback"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Penguin grootte paperback"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki Kaart"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku Kaart"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
-msgstr "Japanese long envelop #3"
+msgstr "Japanese lange envelop #3"
 
-#: src/main/xmli18n-tmp.h:137
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
-msgstr "Japanese long envelop #3"
+msgstr "Japanse lange envelop #3 - landschap"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
-msgstr "Japanse long envelop #4"
+msgstr "Japanse lange envelop #4"
 
-#: src/main/xmli18n-tmp.h:139
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
-msgstr "Japanse long envelop #4"
+msgstr "Japanse lange envelop #4 - landschap"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
-msgstr "Japanse Kaku envelop #4"
+msgstr "Japanse Kaku-envelop #4"
 
-#: src/main/xmli18n-tmp.h:141
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
-msgstr "Japanse Kaku envelop #4"
+msgstr "Japanse Kaku-envelop #4 - landschap"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
-msgstr "Commercial 10"
+msgstr "Commercial 10 - landschap"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Monarch envelop"
 
-#: src/main/xmli18n-tmp.h:146
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3721
 msgid "Monarch Envelope landscape"
-msgstr "Monarch envelop"
+msgstr "Monarch-envelop - landschap"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr "Kaart"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr "Brede briefkaart"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Gebruiker"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
-msgstr "89 mm Roll Paper"
+msgstr "89 mm papierrol"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
-msgstr "4 Inch Roll Paper"
+msgstr "4 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
-msgstr "5 Inch Roll Paper"
+msgstr "5 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
-msgstr "210 mm Roll Paper"
+msgstr "210 mm papierrol"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
-msgstr "13 Inch Roll Paper"
+msgstr "13 inch papierrol"
+
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr "17 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
-msgstr "22 Inch Roll Paper"
+msgstr "22 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
-msgstr "24 Inch Roll Paper"
+msgstr "24 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
-msgstr "36 Inch Roll Paper"
+msgstr "36 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
-msgstr "44 Inch Roll Paper"
+msgstr "44 inch papierrol"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr "60 inch paperrol"
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr "64 inch papierrol"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:184
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
-msgstr "Canon BJC-1000"
+msgstr "Canon BJC-5100"
 
-#: src/main/xmli18n-tmp.h:185
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
-msgstr "Canon BJC-6500"
+msgstr "Canon BJC-5500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:193
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
-msgstr "Canon BJC-6500"
+msgstr "Canon BJC-8500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/main/xmli18n-tmp.h:211
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4500"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/main/xmli18n-tmp.h:214
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
-msgstr "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP5300"
 
-#: src/main/xmli18n-tmp.h:215
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
-msgstr "Canon PIXMA iP2000"
+msgstr "Canon PIXMA iP6000D"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/main/xmli18n-tmp.h:217
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
-msgstr "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iP8500"
 
-#: src/main/xmli18n-tmp.h:218
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
-msgstr "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iX5000"
 
-#: src/main/xmli18n-tmp.h:219
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
-msgstr "Canon PIXMA MP500"
+msgstr "Canon PIXMA Pro9500"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/main/xmli18n-tmp.h:221
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP170"
 
-#: src/main/xmli18n-tmp.h:222
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP180"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/main/xmli18n-tmp.h:224
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP520"
 
-#: src/main/xmli18n-tmp.h:225
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP610"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/main/xmli18n-tmp.h:227
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP710"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/main/xmli18n-tmp.h:229
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
-msgstr "Canon PIXMA MP700"
+msgstr "Canon PIXMA MP740"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/main/xmli18n-tmp.h:238
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
-msgstr "Canon i850"
+msgstr "Canon i80"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+msgid "Epson B-300"
+msgstr "Epson B-300"
+
+#: src/xml/xmli18n-tmp.h:3825
+msgid "Epson B-308"
+msgstr "Epson B-308"
+
+#: src/xml/xmli18n-tmp.h:3826
+msgid "Epson B-500DN"
+msgstr "Epson B-500DN"
+
+#: src/xml/xmli18n-tmp.h:3827
+msgid "Epson B-508DN"
+msgstr "Epson B-508DN"
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:283
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3868
 msgid "Epson Stylus C110"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus C110"
 
-#: src/main/xmli18n-tmp.h:284
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3869
 msgid "Epson Stylus C120"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus C120"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/main/xmli18n-tmp.h:358
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3954
 msgid "Epson Stylus Photo R280"
-msgstr "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo R280"
 
-#: src/main/xmli18n-tmp.h:359
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3955
 msgid "Epson Stylus Photo R285"
-msgstr "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo R285"
+
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1900"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/main/xmli18n-tmp.h:376
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3977
 msgid "Epson Stylus Photo RX585"
-msgstr "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX585"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/main/xmli18n-tmp.h:378
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3979
 msgid "Epson Stylus Photo RX595"
-msgstr "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX595"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/main/xmli18n-tmp.h:383
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3985
 msgid "Epson Stylus Photo RX680"
-msgstr "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX680"
 
-#: src/main/xmli18n-tmp.h:384
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:3986
 msgid "Epson Stylus Photo RX685"
-msgstr "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX685"
+
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX560"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3988
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
-msgstr "Epson Stylus Photo R800"
-
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7800"
+
+#: src/xml/xmli18n-tmp.h:3997
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7880"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9800"
+
+#: src/xml/xmli18n-tmp.h:4002
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9880"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11880"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:412
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4019
 msgid "Epson Stylus CX4400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4400"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:417
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4024
 msgid "Epson Stylus CX4900"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4900"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4031
+msgid "Epson Stylus CX5500"
+msgstr "Epson Stylus CX5500"
+
+#: src/xml/xmli18n-tmp.h:4032
 msgid "Epson Stylus CX5600"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus CX5600"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/main/xmli18n-tmp.h:433
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4041
 msgid "Epson Stylus CX7400"
-msgstr "Epson Stylus CX3700"
+msgstr "Epson Stylus CX7400"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
 #, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 msgid "Epson Stylus CX9400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:441
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4052
 msgid "Epson Stylus D92"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus D92"
 
-#: src/main/xmli18n-tmp.h:442
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4053
 msgid "Epson Stylus D120"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus D120"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:445
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4056
 msgid "Epson Stylus DX4050"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4050"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:448
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4059
 msgid "Epson Stylus DX4400"
-msgstr "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4400"
 
-#: src/main/xmli18n-tmp.h:449
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4060
 msgid "Epson Stylus DX4450"
-msgstr "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4450"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:451
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4062
 msgid "Epson Stylus DX7000F"
+msgstr "Epson Stylus DX7000F"
+
+#: src/xml/xmli18n-tmp.h:4063
+msgid "Epson Stylus DX7400"
+msgstr "Epson Stylus DX7400"
+
+#: src/xml/xmli18n-tmp.h:4064
+msgid "Epson Stylus DX7450"
+msgstr "Epson Stylus DX7450"
+
+#: src/xml/xmli18n-tmp.h:4065
+msgid "Epson Stylus DX8400"
+msgstr "Epson Stylus DX8400"
+
+#: src/xml/xmli18n-tmp.h:4066
+msgid "Epson Stylus DX8450"
+msgstr "Epson Stylus DX8450"
+
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
 msgstr "Epson Stylus CX7000F"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #, fuzzy
-msgid "Epson Stylus DX7400"
-msgstr "Epson Stylus DX4200"
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4074
 #, fuzzy
-msgid "Epson Stylus DX7450"
-msgstr "Epson Stylus DX4250"
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4075
 #, fuzzy
-msgid "Epson Stylus DX8400"
-msgstr "Epson Stylus CX8400"
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4076
 #, fuzzy
-msgid "Epson Stylus DX8450"
-msgstr "Epson Stylus DX3850"
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:457
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
-msgstr "Epson PictureMate Flash"
+msgstr "Epson PictureMate Dash"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/main/xmli18n-tmp.h:462
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 100"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+#, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/main/xmli18n-tmp.h:467
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 260"
 
-#: src/main/xmli18n-tmp.h:468
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 270"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/main/xmli18n-tmp.h:470
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 290"
 
-#: src/main/xmli18n-tmp.h:471
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 500"
 
-#: src/main/xmli18n-tmp.h:472
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
-msgstr "Epson PictureMate 200"
+msgstr "Epson PictureMate 2005"
+
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Epson E 500"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:479
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
-msgstr "Epson E 100"
+msgstr "Epson E 300"
 
-#: src/main/xmli18n-tmp.h:480
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
-msgstr "Epson E 100"
+msgstr "Epson E 500"
 
-#: src/main/xmli18n-tmp.h:481
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
-msgstr "Epson E 150"
+msgstr "Epson E 520"
 
-#: src/main/xmli18n-tmp.h:482
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
-msgstr "Epson E 100"
+msgstr "Epson E 700"
 
-#: src/main/xmli18n-tmp.h:483
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
-msgstr "Epson E 200"
+msgstr "Epson E 720"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:495
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
-msgstr "Epson PM 700C"
+msgstr "Epson PM 670C"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+msgid "Epson Offirio PX B300"
+msgstr "Epson Offirio PX B300"
+
+#: src/xml/xmli18n-tmp.h:4183
+msgid "Epson Offirio PX B500"
+msgstr "Epson Offirio PX B500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+msgid "Epson PX G5300"
+msgstr "Epson PX G5300"
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:550
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
-msgstr "Epson PM 780C"
+msgstr "Epson PX V780"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
-msgstr "Brother HL-4Ve"
-
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
-msgstr "Brother HL-10V"
-
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
-msgstr "Brother HL-10h"
-
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
-msgstr "Brother HL-630"
-
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
-msgstr "Brother HL-660"
-
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
-msgstr "Brother HL-760"
-
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
-msgstr "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-8045D"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/xml/xmli18n-tmp.h:4212
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:4213
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:4214
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:4215
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:4218
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/xml/xmli18n-tmp.h:4219
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/xml/xmli18n-tmp.h:4220
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:4221
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
+msgstr "Brother HL-1430"
+
+#: src/xml/xmli18n-tmp.h:4223
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
+msgstr "Brother HL-1450"
+
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1470N"
+
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
+msgstr "Brother HL-1650"
+
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1670N"
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr "Brother HL-1850"
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1870N"
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr "Brother HL-2460"
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr "Brother HL-2460N"
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr "Brother HL-5030"
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr "Brother HL-5040"
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr "Brother HL-5050"
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr "Brother HL-5070N"
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr "Brother HL-5140"
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr "Brother HL-5150D"
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-5170DN"
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr "Brother HL-7050"
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr "Brother HL-7050N"
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-N2050"
+
+#: src/xml/xmli18n-tmp.h:4282
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-N2050+"
+
+#: src/xml/xmli18n-tmp.h:4283
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-N2050PS"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-N2050PS+"
+
+#: src/xml/xmli18n-tmp.h:4285
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-N2120"
+
+#: src/xml/xmli18n-tmp.h:4286
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-N2500"
+
+#: src/xml/xmli18n-tmp.h:4287
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-N2500PS"
+
+#: src/xml/xmli18n-tmp.h:4288
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-N2750"
+
+#: src/xml/xmli18n-tmp.h:4289
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-N2750PS"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:623
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4295
 msgid "Generic PCL 4 LF Printer"
-msgstr "Generic PCL 4 Printer"
+msgstr "Generic PCL 4 LF Printer"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:625
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4297
 msgid "Generic PCL 5 LF Printer"
-msgstr "Generic PCL 5 Printer"
+msgstr "Generic PCL 5 LF Printer"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:627
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4299
 msgid "Generic PCL 5c LF Printer"
-msgstr "Generic PCL 5c Printer"
+msgstr "Generic PCL 5c LF Printer"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:629
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4301
 msgid "Generic PCL 5e LF Printer"
-msgstr "Generic PCL 5e Printer"
+msgstr "Generic PCL 5e LF Printer"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:631
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4303
 msgid "Generic PCL 6/PCL XL LF Printer"
-msgstr "Generic PCL 6/PCL XL Printer"
+msgstr "Generic PCL 6/PCL XL LF Printer"
+
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr "Gestetner 10512"
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr "Gestetner 2212"
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr "Gestetner 2712"
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr "Gestetner 3212"
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr "Gestetner 3502"
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr "Gestetner 3532"
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr "Gestetner 4235g"
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr "Gestetner 4502"
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr "Gestetner 4532"
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr "Gestetner 4245g"
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr "Gestetner 6002"
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr "Gestetner 7502"
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr "Gestetner 9002"
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr "Gestetner DSm415"
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr "Gestetner DSm615"
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr "Gestetner DSm616"
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr "Gestetner DSm618"
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr "Gestetner DSm618d"
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr "Gestetner DSm620"
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr "Gestetner DSm620d"
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr "Gestetner DSm622"
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr "Gestetner DSm627"
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr "Gestetner DSm635"
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr "Gestetner DSm635G"
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr "Gestetner DSm645"
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr "Gestetner DS645G"
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr "Gestetner DSm651"
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr "Gestetner DSm660"
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr "Gestetner DSm675"
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr "Gestetner DSm725"
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr "Gestetner DSm730"
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr "Gestetner DSm735"
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr "Gestetner DSm735G"
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr "Gestetner DSm745"
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr "Gestetner DSm745G"
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr "Gestetner MP1100"
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr "Gestetner DSm7110"
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr "Gestetner MP1350"
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr "Gestetner DSm7135"
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr "Gestetner MP1600"
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr "Gestetner DSm716"
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr "Gestetner MP2000"
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr "Gestetner DSm721d"
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr "Gestetner MP2500"
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr "Gestetner DSm625"
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr "Gestetner MP3500"
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr "Gestetner DSm735e"
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr "Gestetner MP4500"
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr "Gestetner DSm745e"
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr "Gestetner MP5500"
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr "Gestetner DSm755"
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr "Gestetner MP6500"
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr "Gestetner DSm765"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr "Gestetner MP7500"
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr "Gestetner DSm775"
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr "Gestetner MP9000"
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr "Gestetner DSm790"
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr "Gestetner MP 161"
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr "Gestetner DSm416"
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr "Gestetner MP 2510"
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr "Gestetner DSm725e"
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr "Gestetner MP 2550"
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr "Gestetner MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr "Gestetner MP 3010"
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr "Gestetner DSm730e"
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr "Gestetner MP 3350"
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr "Gestetner MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr "Gestetner MP 4000"
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr "Gestetner MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr "Gestetner MP 5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr "Gestetner MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:777
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
-msgstr "HP LaserJet 1012"
+msgstr "HP LaserJet 1022"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1160"
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1320"
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2410"
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 2420"
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2430"
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 3015"
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 3020"
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 3030"
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 3050"
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 3052"
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3055"
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3380"
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3390"
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 3392"
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4240"
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4250"
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4345 mfp"
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4350"
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 5200"
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 5200L"
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9040"
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 9040 MFP"
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 9050"
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 9050 MFP"
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet M3027 MFP"
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet M3035 MFP"
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet M4345 MFP"
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet M5025 MFP"
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet M5035 MFP"
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet P2010"
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet P2015"
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet P3004"
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet P3005"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4353 MF"
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4452 MF"
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr "Infotec IS2022"
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr "Infotec IS2027"
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr "Infotec IS2032"
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr "Infotec IS2035"
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr "Infotec IS2045"
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr "Infotec IS2090"
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr "Infotec IS2105"
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr "Infotec IS 2015"
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr "Infotec IS 2018"
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr "Infotec IS 2018D"
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr "Infotec IS 2060"
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr "Infotec IS 2075"
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr "Infotec IS 2122"
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr "Infotec IS 2127"
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr "Infotec IS 2132"
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr "Infotec IS 2135"
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr "Infotec IS 2145"
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr "Infotec IS 2151"
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr "Infotec IS 2160"
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr "Infotec IS 2175"
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr "Infotec IS 2215"
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr "Infotec IS 2216"
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr "Infotec IS 2220"
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr "Infotec IS 2220D"
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr "Infotec IS 2225"
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr "Infotec IS 2230"
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr "Infotec IS 2235"
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr "Infotec IS 2245"
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr "Infotec IS 2255"
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr "Infotec IS 2265"
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr "Infotec IS 2275"
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr "Infotec IS 2316"
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr "Infotec IS 2320"
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr "Infotec IS 2325"
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr "Infotec IS 2416"
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr "Infotec IS 2425"
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr "Infotec IS 2430"
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr "Infotec IS 2435"
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr "Infotec IS 2445"
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr "Infotec IS 3090"
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr "Infotec IS 3110"
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr "Infotec IS 3135"
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr "Infotec MP 2550"
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr "Infotec MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr "Infotec MP 3350"
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr "Infotec MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr "Infotec MP 4000"
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr "Infotec MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr "Infotec MP 5000"
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr "Infotec MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
+msgstr "Lanier 5622"
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
+msgstr "Lanier 5627"
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
-msgstr "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
+msgstr "Lanier 5632"
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
+msgstr "Lanier 5635"
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
-msgstr "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
+msgstr "Lanier 5645"
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
-msgstr "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
+msgstr "Lanier LD0105"
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
-msgstr "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
+msgstr "Lanier LD015"
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
-msgstr "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
+msgstr "Lanier LD035"
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
-msgstr "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
+msgstr "Lanier LD045"
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
-msgstr "Minolta PagePro 8L"
-
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
+msgstr "Lanier LD060"
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
+msgstr "Lanier LD075"
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
+msgstr "Lanier LD090"
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
+msgstr "Lanier LD115"
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
+msgstr "Lanier LD116"
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
+msgstr "Lanier LD118"
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
+msgstr "Lanier LD118d"
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
-msgstr "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
+msgstr "Lanier LD120"
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
-msgstr "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
+msgstr "Lanier LD120d"
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
-msgstr "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
+msgstr "Lanier LD122"
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
-msgstr "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
+msgstr "Lanier LD127"
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
-msgstr "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
+msgstr "Lanier LD132"
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
-msgstr "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
+msgstr "Lanier LD135"
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
-msgstr "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
+msgstr "Lanier LD145"
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
-msgstr "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
+msgstr "Lanier LD151"
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
-msgstr "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
+msgstr "Lanier LD160"
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
-msgstr "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
+msgstr "Lanier LD175"
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
-msgstr "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
+msgstr "Lanier LD225"
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
-msgstr "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
+msgstr "Lanier LD230"
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
-msgstr "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
+msgstr "Lanier LD235"
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
-msgstr "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
+msgstr "Lanier LD245"
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
-msgstr "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
+msgstr "Lanier MP 2500"
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
-msgstr "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
+msgstr "Lanier LD125"
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
-msgstr "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
+msgstr "Lanier MP 1100"
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
-msgstr "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
+msgstr "Lanier LD1100"
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
+msgstr "Lanier MP 1350"
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
-msgstr "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
+msgstr "Lanier LD1135"
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
-msgstr "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
+msgstr "Lanier MP 1600"
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
-msgstr "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
+msgstr "Lanier LD316"
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
-msgstr "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
+msgstr "Lanier MP 161"
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
-msgstr "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
+msgstr "Lanier LD016"
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
-msgstr "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
+msgstr "Lanier MP 2000"
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
-msgstr "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
+msgstr "Lanier LD320d"
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
-msgstr "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
+msgstr "Lanier MP 2510"
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
-msgstr "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
+msgstr "Lanier LD325"
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
-msgstr "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
+msgstr "Lanier MP 2550B"
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
-msgstr "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
+msgstr "Lanier LD425B"
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
-msgstr "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
+msgstr "Lanier MP 2550"
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
-msgstr "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
+msgstr "Lanier LD425"
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
-msgstr "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
+msgstr "Lanier MP 3010"
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
-msgstr "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
+msgstr "Lanier LD330"
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
-msgstr "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
+msgstr "Lanier MP 3350B"
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
-msgstr "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
+msgstr "Lanier LD433B"
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
-msgstr "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
+msgstr "Lanier MP 3350"
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
-msgstr "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
+msgstr "Lanier LD433"
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
+msgstr "Lanier MP 3500"
 
-#: src/main/xmli18n-tmp.h:990
-#, fuzzy
-msgid "Sharp AR-M257"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
+msgstr "Lanier LD335"
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
-msgstr "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr "Lanier MP 4000B"
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
-msgstr "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
+msgstr "Lanier LD040B"
 
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
-msgstr "Star LaserPrinter 8"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
+msgstr "Lanier MP 4000"
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
-msgstr "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr "Lanier LD040"
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
-msgstr "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
+msgstr "Lanier MP 4500"
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
-msgstr "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
+msgstr "Lanier LD345"
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
-msgstr "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
+msgstr "Lanier MP 5000B"
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
-msgstr "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
+msgstr "Lanier LD050B"
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
+msgstr "Lanier MP 5000"
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
-msgstr "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
+msgstr "Lanier LD050"
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
-msgstr "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
+msgstr "Lanier MP 5500"
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
-msgstr "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
+msgstr "Lanier LD255"
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
+msgstr "Lanier MP 6500"
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
-msgstr "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
+msgstr "Lanier LD265"
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
-msgstr "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
+msgstr "Lanier MP 7500"
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
-msgstr "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
+msgstr "Lanier LD275"
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
+msgstr "Lanier MP 9000"
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
+msgstr "Lanier LD190"
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
-msgstr "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
-msgstr "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E321"
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
-msgstr "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E323"
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
-msgstr "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
-msgstr "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
-msgstr "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
-msgstr "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
-msgstr "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
-msgstr "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
-msgstr "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
-msgstr "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
-msgstr "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
-msgstr "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
-msgstr "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
-msgstr "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr "NRG 10515"
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr "NRG 10518"
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr "NRG 10512"
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
+msgstr "NRG 2205"
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
+msgstr "NRG 2238"
 
-#: src/main/xmli18n-tmp.h:1033
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr "NRG 2212"
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
+msgstr "NRG 2705"
 
-#: src/main/xmli18n-tmp.h:1035
-#, fuzzy
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr "NRG 2738"
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr "NRG 2712"
 
-#: src/main/xmli18n-tmp.h:1037
-#, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr "NRG 3205"
 
-#: src/main/xmli18n-tmp.h:1038
-#, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr "NRG 3238"
 
-#: src/main/xmli18n-tmp.h:1039
-#, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr "NRG 3212"
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
-msgstr "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr "NRG 3525"
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
-msgstr "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr "NRG 3508"
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
+msgstr "NRG 3502"
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
+msgstr "NRG 3545"
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
+msgstr "NRG 3518"
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
+msgstr "NRG 3532"
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
+msgstr "NRG 4525"
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
+msgstr "NRG 4508"
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
-msgstr "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr "NRG 4502"
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
+msgstr "NRG 4545"
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
-msgstr "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
+msgstr "NRG 4518"
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
-msgstr "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
+msgstr "NRG 4532"
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
-msgstr "Type kromme"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
+msgstr "NRG 6002"
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "Bij een lineaire kromme, spline geïnterpoleerd of vrije-vorm"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr "NRG 6005"
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "Kleinste X"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
+msgstr "NRG 6008"
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
-msgstr "Kleinst mogelijke waarde voor X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
+msgstr "NRG 7502"
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "Grootste X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr "NRG 7505"
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
-msgstr "Grootst mogelijke waarde voor X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr "NRG 7508"
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Kleinste Y"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr "NRG 9005"
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
-msgstr "Kleinst mogelijke waarde van Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr "NRG 9008"
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Grootste Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr "NRG 9002"
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
-msgstr "Grootst mogelijke waarde van Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
+msgstr "NRG DSm415"
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "_Gamma-waarde"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
+msgstr "NRG DSm615"
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Inch"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr "NRG DSm616"
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Stel de basis-meeteenheid in op inches"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr "NRG DSm618"
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr "NRG DSm618d"
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Stel de basis-meeteenheid in op centimeter"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr "NRG DSm620"
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
-msgstr "Punten"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr "NRG DSm620d"
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Stel de basis-meeteenheid in op punten (1/72\")"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr "NRG DSm622"
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "mm"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr "NRG DSm627"
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Stel de basis-meeteenheid in op millimeter"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr "NRG DSm632"
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "Pica"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr "NRG DSm635"
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Stel de basis-meeteenheid in op pica (1/12\")"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr "NRG DSm645"
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Kleuruitvoer"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr "NRG DSm651"
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Print in grijstinten met zwarte inkt"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr "NRG DSm660"
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "Standaard commando"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr "NRG DSm675"
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "Gebruik het standaard printcommando"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr "NRG DSm725"
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "Fabrikaat specifiek commando"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
+msgstr "NRG DSm730"
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "Gebruik het fabrikaat specifieke commando"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr "NRG DSm735"
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Bestand"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr "NRG DSm745"
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "Afdrukken naar een bestand"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr "NRG MP 1100"
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
-msgstr "Kromme aanpassen..."
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr "NRG MP 1350"
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
-msgstr "Stel standaard in"
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr "NRG MP 1600"
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
-msgstr "Herstel het vorige"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr "NRG MP 161"
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
+msgstr "NRG MP 2000"
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Annuleren"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr "NRG MP 2500"
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Instellen Printer..."
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr "NRG MP 2510"
 
-#: src/gutenprintui2/panel.c:1018
-#, fuzzy
-msgid "Reset"
-msgstr "Het best"
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr "NRG MP 2550"
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Print v%s"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
+msgstr "NRG MP 2550B"
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Info"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr "NRG MP 3010"
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
-msgstr ""
-"Afdrukken en\n"
-"instellingen opslaan"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr "NRG MP 3350"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
-msgstr ""
-"Instellingen\n"
-"opslaan"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr "NRG MP 3350B"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Afdrukken"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr "NRG MP 3500"
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Voorbeeld"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr "NRG MP 4000"
 
-#: src/gutenprintui2/panel.c:1448
-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 ""
-"Plaats de afbeelding op de pagina.\n"
-"Klik en sleep met de eerste knop om de afbeelding te plaatsen.\n"
-"Klik en sleep met de tweede knop om de afbeelding met een fijnere "
-"nauwkeurigheid te plaatsen; elke eenheid beweging verplaatst deze één punt "
-"(1/72\")\n"
-"Klik en sleep met de derde (middelste) knop om de afbeelding in eenheden van "
-"zijn grootte te verplaatsen.\n"
-"Bij het ingedrukt houden van de Shift-toets tijdens klikken en slepen "
-"beperkt de beweging tot horizontaal of verticaal.\n"
-"Als u op een andere knop klikt bij het slepen, dan keert de afbeelding terug "
-"naar zijn oorspronkelijke plaats."
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr "NRG MP 4000B"
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "Papierafmetingen"
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
+msgstr "NRG MP 4500"
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "Toon alle papierafmetingen"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr "NRG MP 5000"
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Afmetingen"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
+msgstr "NRG MP 5000B"
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Breedte: "
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr "NRG MP 5500"
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Breedte van het papier waarop je wenst te printen"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr "NRG MP 6500"
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Hoogte: "
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr "NRG MP 7500"
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Hoogte van het papier waarop je wenst te printen"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr "NRG MP 9000"
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
-msgstr "Automatische papierafmetingen"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr "Oki OL400"
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "Aantal kopieën"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr "Oki OL400e"
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Kies het aantal af te drukken kopieën; een waarde tussen 1 en 100"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
+msgstr "Oki OL400ex"
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "Positie van afbeelding"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr "Oki OL410e"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automatisch"
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr "Oki OL600e"
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Portret"
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr "Oki OL610e/S"
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Landschap"
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr "Oki OL800"
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Ondersteboven"
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr "Oki OL810ex"
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Seascape"
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr "Oki Okipage 6e"
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr ""
-"Kies de orientatie: portret, landschap, ondersteboven of seascape "
-"(ondersteboven landschap)"
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr "Oki Okipage 6ex"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Oriëntatie:"
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr "Oki Okipage 8p"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Links:"
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr "Oki Okipage 10e"
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Afstand vanaf de linkerkant van het papier tot de afdruk"
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr "Oki Okipage 10ex"
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Rechts:"
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr "Oki Okipage 14ex"
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr ""
-"Afstand vanaf de linkerkant van het papier tot de rechterkant van de afdruk"
+#: src/xml/xmli18n-tmp.h:4943
+msgid "Oki Super 6e"
+msgstr "Oki Super 6e"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Afstand vanaf de rechterkant van het papier tot de afdruk"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Boven:"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Onder:"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr ""
-"Afstand vanaf de bovenkant van het papier tot de onderkant van de afbeelding"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Afstand vanaf de onderkant van het papier tot de afdruk"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Midden X:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "Horzontaal"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centreer het plaatje horizontaal op het papier"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 1022"
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Beide"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 1027"
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centreer het plaatje op het papier"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 1032"
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "Verticaal"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 1035"
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centreer het plaatje verticaal op het papier"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 1045"
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Stel Printer in"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 1060"
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
-msgstr "Printermerk:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 1075"
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
-msgstr "Selecteer het merk van uw printer"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 1515"
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Printer model:"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 2015"
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Selecteer jouw printer model"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 2016"
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD Bestand:"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 2018"
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 2018D"
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Bladeren"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 2020"
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Kies de juiste PPD bestandsnaam voor jouw printer"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 2020D"
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr ""
-"Selecteer de naam van de uitvoerrij (niet het type, of model, of printer) "
-"die u wilt uitprinten"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 2022"
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "Printerrij:"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 2027"
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "Geef het juiste commando om naar uw printer te printen. "
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 2032"
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "Voer de bestandsnaam in waarnaar geprint moet worden. "
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 2035"
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
-msgstr "Bestand waar print naar toe moet"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 2035e"
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "Afdrukken naar bestand"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 2045"
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Stel nieuwe printer in"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 2045e"
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Printernaam:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 2051"
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Voer de naam in van de logische printer"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 2060"
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "Info over Gutenprint "
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 2075"
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Gutenprint versie"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 2090"
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Printerinstellingen"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 2105"
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr ""
-"Selecteer de naam van de printer (Niet het type, of model, of printer) "
-"waarna je wenst te printen"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Instellen Printer..."
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 3025"
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr ""
-"Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
-"deze printer af te drukken."
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 3030"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Nieuwe Printer..."
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 3035"
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
-msgstr ""
-"Definieer een logische printer. Deze kan gebruikt worden om een verzameling "
-"van instellingen die u bewaren wilt voor toekomstig gebruik."
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 3045"
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Stel standaardwaarden in"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "Afbeeldingsgrootte"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio MP 1100"
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Schaal:"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio MP 1350"
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Stel de schaal (afmeting) in van het plaatje"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio MP 1600"
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Schalen met:"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio MP 161"
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr ""
-"Moet schaling gemeten worden in het percentage van de beschikbare "
-"paginagrootte of het aantal punten per inch"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio MP 2000"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Procent"
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio MP 2500"
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Schaal de afdruk tot de afmeting van de pagina"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio MP 2510"
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio MP 2550"
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Schaal de afdruk tot het aantal punten per inch"
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio MP 2550B"
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Geef de breedte van de afdruk"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio MP 3010"
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Geef de hoogte van de afdruk"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio MP 3350"
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr ""
-"Gebruik de originele\n"
-"grootte van de afbeelding"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio MP 3350B"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Stel de afdrukgrootte gelijk aan de grootte van de afbeelding"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio MP 3500"
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Aanpassing van afdrukkleur"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio MP 4000"
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Stel standaardwaarden in"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio MP 4000B"
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Sluiten"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio MP 4500"
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Afdruk voorvertoning"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio MP 5000"
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
-msgstr "Toon uitvoerkanalen:"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio MP 5000B"
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
-msgstr "Uitvoer"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio MP 5500"
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Type uitvoer:"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio MP 6500"
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Kies het gewenste type uitvoer"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio MP 7500"
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Past uitvoer aan..."
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio MP 9000"
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr ""
-"Pas de kleurbalans, helderheid, contrast, verzadiging en ruis-algoritme aan"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "Afmeting eenheden:"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-1250"
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
-msgstr " "
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-1450"
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Eenheden:"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-1450PS"
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Kies de basiseenheid van afmeting voor het afdrukken"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-1650"
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-1651N"
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-1750"
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-2150"
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-2150PS"
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-2151N"
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-2151NPS"
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-2152W"
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "Printer"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-2152WPS"
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(Standaard printer)"
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-2250"
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "Printermogelijkheden"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-2550"
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
-msgstr "Controle op uitvoer"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-2551N"
 
-#: src/cups/genppd.c:151
-msgid "Common"
-msgstr "Gezamelijk"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-2552W"
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
-msgstr "Extra 1"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
-msgstr "Extra 2"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
-msgstr "Extra 3"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
-msgstr "Extra 4"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
-msgstr "Extra 5"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
 
-#. 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:1064
-msgid "English"
-msgstr "Engels"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
-msgstr "Dubbelzijdig printen"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
-msgstr "Verklein de pagina als dat nodig is om op de pagina te blijven"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7300"
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
-msgstr "Verkleinen (de gehele pagina afdrukken)"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7300N"
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
-msgstr "Afsnijden (behoud de afmetingen)"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
-msgstr "Vergroot (gebruik de gehele pagina)"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "Nee"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr "Savin 2522"
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "Ja"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr "Savin 2527"
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
-msgstr "Waarde"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr "Savin 2532"
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
-msgstr "Fijnafstelling"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
+msgstr "Savin 2535"
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil versie"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr "Savin 2235"
 
-#: 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-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"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr "Savin 2545"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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 ""
-"Gebruik: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                  [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                  [-C choices] [-p patterns]\n"
-"Doe onderhoud aan de EPSON Stylus (R) printers.\n"
-"Voorbeeld: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"           escputil --clean-head --new --printer-name MyQueue\n"
-"\n"
-"  Commando's:\n"
-"    -c|--clean-head    Maak de printkop schoon.\n"
-"    -n|--nozzle-check  Print een nozzle testpatroon.\n"
-"                       Vuile of verstopte nozzles vertonen zich als gaten in "
-"het\n"
-"                       patroon.  Als u een gat ziet dan moet u de printkop\n"
-"                       schoonmaken.\n"
-"    -a|--align-head    Lijn de printkop uit.  VOORZICHTIG: Misbruik van dit\n"
-"                       programma kan resulteren in een slechte "
-"printkwaliteit en/of\n"
-"                       beschadiging van de printer.\n"
-"    -s|--status        Haal de printerstatus op.\n"
-"    -i|--ink-level     Toon de inktniveaus van de printer.  Dit vereist\n"
-"                       lees/schrijf-toegang tot het raw-printerapparaat.\n"
-"    -e|--extended-ink-info     Toon de uitgebreide inktinformatie van de\n"
-"                       printer.  Dit vereist lees/schrijf-toegang tot het\n"
-"                       raw-printerapparaat.\n"
-"    -d|--identify      Vraag het merk en model van de printer. Dit vereist\n"
-"                       lees/schrijf-toegang tot het raw-printerapparaat.\n"
-"    -l|--license       Toon de licentie en garantie-bepalingen van dih "
-"programma.\n"
-"    -M|--list-models   Toon een lijst van de beschikbare printermodellen.\n"
-"    -h|--help          Toon dit hulpbericht.\n"
-"  Opties:\n"
-"    -P|--printer-name  Specificeer de naam van de printerqueue.\n"
-"                       Standaad is de standaard systeemprinter.\n"
-"    -r|--raw-device    Specificeer de naam van het apparaat waar direct "
-"naar\n"
-"                       geschreven moet worden i.p.v. via een pinterqueue.\n"
-"    -u|--new           De printer is een nieuwe printer (Stylus Color 740 "
-"of\n"
-"                       nieuwer).  Alleen noodzakelijk bij een niet-raw "
-"apparaat.\n"
-"    -q|--quiet         Onderdruk de banner.\n"
-"    -S|--short-name    Toon de korte naam van de printer met --identify.\n"
-"    -m|--model         Specificeer het preciese printermodel voor de "
-"uitlijning van de kop\n"
-"    -C|--choices       Specificeer het aantal patroonkeuzes voor de "
-"uitlijning\n"
-"    -p|--patterns      Specificeer het aantal patroonsets voor de "
-"uitlijning\n"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr "Savin 2245"
 
-#: 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 ""
-"Gebruik: escputil [OPTIES] [COMMANDO]\n"
-"Gebruik: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Doe onderhoud aan de EPSON Stylus (R) printers.\n"
-"Voorbeeld: escputil -i -r /dev/usb/lp0\n"
-"           escputil -c -u -P MyQueue\n"
-"\n"
-"  Commando's:\n"
-"    -c Maak de printkop schoon.\n"
-"    -n Print een spuitgaatjes testpatroon.\n"
-"          Vuile of verstopte spuitgaatjes komen te voorschijn als gaten in "
-"het\n"
-"          patroon.  Als er zo'n gat is, dan moet de printkop schoongemaakt\n"
-"          worden.\n"
-"    -a Lijn de printkop uit.  VOORZICHTIG: Misbruik van dit\n"
-"          programma kan een slechte printkwaliteit oplevren\n"
-"          en/of de printer beschadigen.\n"
-"    -s Toon de status van de printer.\n"
-"    -i Toon de inktniveau's van de printer.  Dit vereist\n"
-"          lees/schrijftoegang tot het raw-printer-device.\n"
-"    -e Toon de uitgebreide inktinformatie van de printer.\n"
-"          Alleen voor de R800-printer en gelijken. Dit vereist\n"
-"          lees/schrijftoegang tot het raw-printer-device.\n"
-"    -d Vraag het merk en model van de printer op.  Dit\n"
-"          vereist lees/schrijftoegang tot het raw-printer-device.\n"
-"    -l Toon de licentie/garantie bepalingen van dit programma.\n"
-"    -M Toon de beschikbare printermodellen.\n"
-"    -h Toon deze hulpboodschap.\n"
-"  Opties:\n"
-"    -P Specificeer de naam van de betrokken printerqueue.\n"
-"          Standaard is de standaard systeemprinter.\n"
-"    -r Specificeer de naae van het apparaat waar direct naar geschreven\n"
-"          moet worden ga niet via een printerqueue.\n"
-"    -u De printer is een nieuwe printer (Stylus Color 740 of nieuwer).\n"
-"          Alleen nodig als niet een raw-device wordt gebruikt.\n"
-"    -q Onderdruk de banner.\n"
-"    -S Print de korte naam van de printer bij -d.\n"
-"    -m Specificeer het preciese printermodel voor het uitlijnen van de kop.\n"
-"    -C Specificeer het aantal keuzes in patronen voor de uitlijning\n"
-"    -p Specificeer het aantal sets patronen voor uitlijning\n"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
+msgstr "Savin 2560"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Je mag maar een printer of raw apparaat specificeren."
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
+msgstr "Savin 2575"
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "U mag maar een printermodel specificeren"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
+msgstr "Savin 3515"
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
-msgstr "Aantal keuzes voor uitlijning moet tenminste 1 zijn."
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
+msgstr "Savin 40105"
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
-msgstr "Aantal doorgangen voor uitlijning moet tenminste 1 zijn."
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
+msgstr "Savin 4015"
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Onbekende optie %c\n"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
+msgstr "Savin 4018"
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Gebruik: %s [OPTIES] commando\n"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr "Savin 4018d"
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
-msgstr "Geef `%s --help' voor meer informatie.\n"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr "Savin 4022"
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
-msgstr "Geef `%s -h' voor meer informatie.\n"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr "Savin 4027"
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Kan apparaat %s:%s niet openen\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
+msgstr "Savin 4035"
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr "Savin 4135g"
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Kan de opdracht niet versturen naar de printer\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr "Savin 4035e"
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
-msgstr "Lezen van de printer duurt te lang\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr "Savin 4135eG"
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Kan niet lezen van %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr "Savin 4045"
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
-msgstr "Specificeer een raw-apparaat\n"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr "Savin 4145g"
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan %s niet openen lezen/schrijven: %s\n"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr "Savin 4045e"
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Onbekende optie %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr "Savin 4145eG"
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Kan niet schrijven naar %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr "Savin 4051"
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
-msgstr ""
-"\n"
-"Kan niet schrijven naar %s:%s\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
+msgstr "Savin 4060"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
-msgstr ""
-"\n"
-"Kan printer type niet vaststellen.\n"
-"Gebruik -m om uw printermodel te specificeren.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr "Savin 4075"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "Onbekend"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr "Savin 4090"
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
-msgstr "Status: Fout\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr "Savin 7025"
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
-msgstr "Status: Zelfstandig aan het printen\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr "Savin 8016"
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
-msgstr "Status: Bezig\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
+msgstr "Savin 8020"
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
-msgstr "Status: In de wacht\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr "Savin 8020d"
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
-msgstr "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr "Savin 8025"
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr "Status: In pauze\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr "Savin 8025e"
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
-msgstr "Status: Aan het schoonmaken\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr "Savin 8030"
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
-msgstr "Status: Fabrieksinstelling\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr "Savin 8030e"
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr "Status: Aan het afsluiten\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
+msgstr "Savin 8035"
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
-msgstr "Status: Onbekend (%d)\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
+msgstr "Savin 8035g"
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
-msgstr "Fout: fatale fout\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
+msgstr "Savin 8035e"
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
-msgstr "Fout: Het andere interface is gekozen\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
+msgstr "Savin 8045"
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
-msgstr "Fout: Deksel is open\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
+msgstr "Savin 8045g"
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
-msgstr "Fout: Papier zit vast\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
+msgstr "Savin 8045e"
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
-msgstr "Fout: Geen inkt\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr "Savin 8055"
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
-msgstr "Fout: geen papier\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
+msgstr "Savin 8065"
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
-msgstr "Fout: Wacht op signaal van de afscheurplek\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
+msgstr "Savin 8075"
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
-msgstr "Fout: in tweezijdige doorvoer\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
+msgstr "Savin 8090"
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
-msgstr "Fout: Onherstelbare fout in snij-instrument\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
+msgstr "Savin 8110"
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
-msgstr "Fout: Herstelbaar snij-instrument zit vast\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
+msgstr "Savin 8135"
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
-msgstr "Fout: Geen CD-lade aanwezig\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
+msgstr "Savin 816"
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
-msgstr "Fout: Laden van een kaart gaat fout\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
+msgstr "Savin 9016"
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
-msgstr "Fout: Ladedeksel is open\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
+msgstr "Savin 9021d"
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
-msgstr "Fout: Onbekend (%d)\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
+msgstr "Savin 9025"
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
-msgstr "Spuitmondjes zelftest\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
+msgstr "Savin 9025b"
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
-msgstr "Inktniveau's:\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr "Savin 9033"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Kleureninkt"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr "Savin 9033b"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Percentage nog aanwezig"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
+msgstr "Savin 9040"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
-msgstr "Waarschuwing: Zwarte inkt laag\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
+msgstr "Savin 9040b"
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
-msgstr "Waarschuwing: Onbekend (%d)\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
+msgstr "Savin 9050"
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
-msgstr "Jobnaam: "
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr "Savin 9050b"
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
-msgstr "inktniveau's"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "status"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Verkrijgen van %s vereist een 'raw' apparaat.\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr ""
-"Het verkrijgen van uitgebreide inktinformatie vereist een 'raw' apparaat.\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr "Star LS-04"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
-msgstr "Nummer van onderdeel"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "Datum"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
+msgstr "Tally MT908"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Het identificeren van het printermodel vereist een 'raw' apparaat.\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Kan het printermodel niet identificeren.\n"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Bezig met het schoonmaken van de koppen..\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
 
-#: src/escputil/escputil.c:1728
-#, 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/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
 
-#: src/escputil/escputil.c:1732
-#, 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 ""
-"Leest u alstublieft deze instructies nauwkeurig door, voordat u verder "
-"gaat.\n"
-"\n"
-"U kunt met deze applicatie de koppen van uw Epson Stylus inkjet\n"
-"printer uitlijnen. Onjuist gebruik van deze applicatie kan leiden tot\n"
-"verlies in kwaliteit en het kan zelfs uw printer beschadigen. Deze "
-"applicatie\n"
-"is niet gecontroleerd op fouten door Seiko Epson, en wordt geleverd zonder\n"
-"enige vorm van garantie. het gebruik is volledig op eigen risico.\n"
-"\n"
-"Het programma zal %d patronen afdrukken. Elk patroon lijkt erg op de ander.\n"
-"Het patroon bestaat uit een serie paren van verticale lijnen die elkaar "
-"overlappen.\n"
-"Onder elk paar met lijnen staat een nummer tussen %d en %d.\n"
-"\n"
-"Wanneer u de lijnen bekijkt, moet u zoeken naar het paar die het beste is "
-"uitgelijnd,\n"
-"met andere woorden, diegen die samen  de beste enkele lijn vormen.\n"
-"Het gebruik van een loep of vergrootglas wordt aangeraden voor de\n"
-"meest critische inspectie. Er wordt ook aangeraden om een goede kwaliteit\n"
-"papier te gebruiken, zodat de lijnen mooi strak zijn, en niet over het "
-"papier\n"
-"uitvloeien. Wanneer u het nummer heeft uitgekozen, plaats dan het papier "
-"weer\n"
-"terug erug in de printer voordat u het nummer intypt.\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"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/escputil/escputil.c:1767
-#, 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 ""
-"Lees deze instructies heel goed voor, voordat u doorgaat.\n"
-"\n"
-"Dit programma laat u de printkop van uw Epson Stylus inktjetprinter\n"
-"uitlijnen. Als u dit programma verkeerd gebruikt kan de printkwaliteit naar\n"
-"beneden gaan en mogelijk uw printer beschadigen. Dit programma is niet\n"
-"door Seiko Epson gecontroleerd op fouten, en wordt zonder enige garantie\n"
-"ter beschikking gesteld. Het volledige risico van het gebruik van dit\n"
-" programma ligt bij u.\n"
-"\n"
-"Dit programma print een testpatroon dat bestaat uit een aantal paren van\n"
-"verticale lijnen die elkaar overlappen. Onder elk paar lijnen staat een "
-"nummer\n"
-"tussen de %d en %d.\n"
-"\n"
-"Als u deze paren bekijkt, zult u een paar lijnen vinden die het beste zijn\n"
-"uitgelijnd, hetgeen betekent dat deze lijnen het beste samen één lijn "
-"vormen.\n"
-"Bekijk de lijnen zeer zorgvuldig om het beste paar uit te zoeken. Het "
-"gebruik\n"
-"van een loupe of vergrootglas is aanbevolen voor de meest kritische\n"
-"inspectie. Het is ook aan te raden om voor deze test een goede kwaliteit "
-"papier\n"
-"te gebruiken zodat de lijnen goed gevormd zijn en niet door het papier "
-"drukken.\n"
-"Nadat u het nummer hebt gekozen, dat het beste overeenkomt, plaats u het\n"
-"papier terug in de printer voordat u het nummer intikt.\n"
-"\n"
-"Nadat het het uitlijnen nog eens gedaan is, zal het nog een keer geprint "
-"worden\n"
-"U zou moeten vinden dat het middelste paar (#%d van de %d) het beste is.\n"
-"U krijgt dan de mogelijkheid om het resultaat in de printer op te slaan(s),\n"
-"het proces te he(r)halen of te stoppen zonder op te slaan(q). Stoppen zal "
-"niet\n"
-"de vorige instellingen terugzetten, maar de printer aan en uit zetten zal "
-"dat\n"
-"wel doen. Als u stopt, zult u het hele proces opnieuw moeten doorlopen\n"
-"om de resultaten op te slaan. Het is essentieel dat u de printer niet "
-"uitzet\n"
-"tijdens deze procedure.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
 
-#: src/escputil/escputil.c:1811
-#, 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/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
-msgstr "Bezig te stoppen\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
 
-#: src/escputil/escputil.c:1828
-#, 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 ""
-"U dient de uiteindelijke uitvoer zeer zorgvuldig te bekijken om er\n"
-"zeker van te zijn dat de printer juist in uitgelijnd. U kunt nu:\n"
-"  (s)ave, bewaar het resultaat in de printer,\n"
-"  (q)uit, stop zonder het resultaat te bewaren, of\n"
-"  (r)epeat, herhaal het gehele proces vanaf het begin.\n"
-"U krijgt daarna de vraag uw keuze te bevestigen.\n"
-"Wat wilt u doen (s,q, r)?\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
-msgstr ""
-"Graag bevestiging dat u wilt stoppen zonder te bewaren door opnieuw 'q' te "
-"typen:\n"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
 
-#: src/escputil/escputil.c:1850
-#, 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 ""
-"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/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr ""
-"Graag bevestiging dat u het uitlijnproces wilt herhalen door\n"
-"het typen van een 'r':\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Herhaal de uitlijnprocedure.\n"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1871
-#, 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 ""
-"Dit verandert de configuratie van uw printer permanent.\n"
-"WAARSCHUWING: deze procedure is niet goedgekeurd door Seiko Epson en\n"
-"het zou uw printer kunnen beschadigen. Doorgaan?\n"
-"Graag bevestigen door 's' opnieuw in te typen om de instellingen\n"
-"in uw printer te bewaren:\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Bezig met wegschrijven van instellingen..."
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "mislukt!\n"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
-msgstr ""
-"Uw instellingen werden niet succesvol weggeschreven. U moet de\n"
-"uitlijnprocedure herhalen.\n"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "gelukt!\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Uw uitlijn-instellingen zijn bewaard door de printer.\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Onbekend commando.\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Laatste commando is niet bevestigd.\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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 ""
-"Deze procedure neemt aan dat uw printer een Epson %s is.\n"
-"Als dit niet uw printermodel is, type dan control-C en\n"
-"kies uw echte printermodel.\n"
-"\n"
-"Zet een vel papier in uw printer om te beginnen met de\n"
-"procedure voor het uitlijnen van de koppen.\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Druk op enter om door te gaan > "
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
 
-#: src/escputil/escputil.c:1984
-#, 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 ""
-"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/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Stap #%d"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Voer een nieuw vel papier in.\n"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Nummer valt buiten bereik!\n"
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Begrijp niet wat u zonjuist ingetikt hebt!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Probeert de uitlijning in te stellen..."
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "gelukt.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
 
-#: src/escputil/escputil.c:2046
-#, 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 ""
-"Kijk alstublief na of de uitlijning klopt. Kijk, nadat het "
-"uitlijningspatroon\n"
-"weer opnieuw is afgedrukt, of het beste patroon voor elk\n"
-"lijnpatroon %d is. Als dat niet zo is dan zult u de procedure moeten\n"
-"herhalen om de beste kwaliteit te krijgen.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Fout in de invoer\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Bezig met afdrukken..."
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
 
-#~ msgid ""
-#~ "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
-#~ "  does not match the PPD file (%s).  If you have upgraded your version\n"
-#~ "  of Gutenprint recently, you must reinstall all printer queues.\n"
-#~ "  Please refer to your vendor's documentation or the ``foomatic-"
-#~ "ppdfile''\n"
-#~ "  command for instructions.\n"
-#~ "ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) "
-#~ "does not match the PPD file (%s).\n"
-#~ msgstr ""
-#~ "ijsgutenprint: de versie van de geïstalleerde Gutenprint-software (%s)\n"
-#~ "  klopt niet met hetPPD-bestand (%s).  Als u uw versie van Gutenprint\n"
-#~ "  recent up-to-date hebt gebracht dan moet u alle printerqueues opnieuw\n"
-#~ "  installeren.\n"
-#~ "  Kijk in de documentatie van uw leverancier of het commando voor het\n"
-#~ "  ``foomatic-ppdbestand'' voor nadere instructies.\n"
-#~ "FOUT: ijsgutenprint: de versie van de geïnstalleerde Gutenprint software "
-#~ "(%s) klopt niet met het PPD bestand (%s).\n"
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
 
-#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-#~ msgstr ""
-#~ "FOUT: ijsgutenprint: Verkeerde kleurruimte: bps %d kanalen %d ruimte %s\n"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
 
-#~ msgid "ERROR: ijsgutenprint: No row buffer\n"
-#~ msgstr "FOUT: ijsgutenprint: No rijbuffer\n"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
 
-#~ msgid ""
-#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-#~ msgstr ""
-#~ "FOUT: ijsgutenprint: Kan parameter %s=%s niet onleden (verwacht een "
-#~ "nummer)\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-720"
 
-#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-#~ msgstr ""
-#~ "FOUT: ijsgutenprint: Printer moet gespecificeerd worden met -sMODEL\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-730"
 
-#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-#~ msgstr "FOUT: ijsgutenprint: Printer %s is geen bekend model\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-740"
 
-#~ msgid "ijsgutenprint: unknown DeviceModel %s\n"
-#~ msgstr "ijsgutenprint: onbekend MODEL %s\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-750"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-#~ msgstr "FOUT: ijsgutenprint: kan Linksboven %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY ES1"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-#~ msgstr "FOUT: ijsgutenprint: kan Papierafmetingen %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY ES2"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-#~ msgstr "FOUT: ijsgutenprint: kan Kromme %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY ES20"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-#~ msgstr ""
-#~ "FOUT: ijsgutenprint: kan %s met drijvendekomma-getal %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-#~ msgstr "FOUT: ijsgutenprint: kan %s geheel getal %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-#~ msgstr "FOUT: ijsgutenprint: kan %s dimensie %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-#~ msgstr "FOUT: ijsgutenprint: kan %s met logische waarde %s niet ontleden\n"
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
 
-#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-#~ msgstr "FOUT: ijsgutenprint: Onjuiste parameter %s %d\n"
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
 
-#~ msgid "ERROR: ijsgutenprint: bad key code %d\n"
-#~ msgstr "FOUT: ijsgutenprint: onjuiste sleutelcode %d\n"
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-#~ msgstr "FOUT: ijsgutenprint: image_init mislukte %d\n"
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-#~ msgstr "FOUT: ijsgutenprint: Kan bestandsdescriptor niet openen: %s\n"
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
 
-#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-#~ msgstr "FOUT: ijsgutenprint: Kan %s: %s niet openen\n"
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare-Printer-Dock"
 
-#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-#~ msgstr "FOUT: ijsgutenprint: Onbekende printer %s\n"
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
 
-#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-#~ msgstr "FOUT: ijsgutenprint: Foute parameters; kan niet doorgaan!\n"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr "RAW DATA 16 bit"
 
-#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-#~ msgstr ""
-#~ "FOUT: ijsgutenprint: Verkrijgen van volgende rij is mislukt op %.0f\n"
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr "RAW DATA 8 bit"
diff --git a/po/pl.gmo b/po/pl.gmo
index 640da4f..a2deeb6 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 6efe962..607828a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2001-10-18 11:53+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Ustaw domy¶lne"
@@ -98,18 +98,19 @@ msgstr ""
 msgid "Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -157,9 +158,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Rozmiar"
@@ -168,309 +169,355 @@ msgstr "Rozmiar"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Ustawienia drukarki"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Rozdzielczo¶æ"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model drukarki:"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr ""
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Automatycznie"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Typ wyj¶ciowy:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr ""
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -505,9 +552,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Odcienie szaro¶ci"
 
@@ -524,11 +570,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -594,7 +640,7 @@ msgid "Output image type"
 msgstr "Typ wyj¶ciowy:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -658,16 +704,56 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
@@ -675,16 +761,56 @@ msgstr "Niebieskozielony"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Purpurowy"
 
@@ -692,16 +818,56 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "¯ó³æ"
 
@@ -709,9 +875,11 @@ msgstr "¯ó³æ"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -719,7 +887,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -727,9 +895,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -738,16 +907,54 @@ msgid "Adjust the blue gamma"
 msgstr ""
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Czarny"
 
@@ -755,7 +962,7 @@ msgstr "Czarny"
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -769,7 +976,7 @@ msgstr "Odcienie szaro¶ci"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurowy"
@@ -778,7 +985,7 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "¯ó³æ"
@@ -806,10 +1013,11 @@ msgstr "Typ tuszu:"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ wyj¶ciowy:"
@@ -818,27 +1026,27 @@ msgstr "Typ wyj¶ciowy:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -984,477 +1192,541 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr ""
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozdzielczo¶æ"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ tuszu:"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Anuluj"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Niebieskozielony"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Niebieskozielony"
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the orange map"
+msgstr ""
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:494
-msgid "Gloss Level"
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Gêsto¶æ:"
+
+#: src/main/print-escp2.c:488
+msgid "Adjust the orange density"
 msgstr ""
 
 #: src/main/print-escp2.c:495
+msgid "Gloss Level"
+msgstr ""
+
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 msgid "Light Cyan Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Typ wyj¶ciowy:"
+msgid "Paper Thickness"
+msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Ustaw domy¶lne"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Gêsto¶æ:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Model drukarki:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Zwyk³y papier"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1507,129 +1779,356 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Przezroczyste"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Koperty"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Inne"
 
@@ -1645,170 +2144,195 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr ""
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Przezroczysto¶æ"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr ""
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr ""
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr ""
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr ""
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr ""
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr ""
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr ""
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr ""
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr ""
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Wysoko¶æ:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr ""
 
@@ -1817,6411 +2341,9893 @@ msgstr ""
 msgid "PPDFile"
 msgstr "Plik PPD:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "Plik PPD?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Anuluj"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr ""
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+#, fuzzy
+msgid "Custom"
+msgstr "Automatycznie"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
 #, fuzzy
-msgid "Two Level Grayscale"
-msgstr "Odcienie szaro¶ci"
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Odcienie szaro¶ci"
+msgid "Ultra Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
+#: 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
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Jednolite p³aszczyzny"
+msgid "Photograph"
+msgstr "Fotografia"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Rysunek kresk±"
+
+#: src/main/generic-options.c:55
+#, fuzzy
+msgid "Page"
+msgstr "Rozmiar"
+
+#: src/main/generic-options.c:56
+msgid "Job"
 msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "Seven Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Image Type"
+msgstr "Typ obrazu:"
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr ""
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1705
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Seven Color Enhanced"
-msgstr "Stylus Color Pro"
+msgid "Page Number"
+msgstr "Rozmiar"
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Stylus Color Pro"
+msgid "Page number"
+msgstr "Rozmiar"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#: src/gutenprintui2/curve.c:130
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Curve type"
+msgstr "Czarny"
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
+#: 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/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Cal"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgid "Points"
+msgstr "Wydrukuj"
+
+#: 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/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: 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
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Custom Command"
+msgstr "Polecenie:"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr ""
 
-#: src/main/escp2-channels.c:1981
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Plik"
+
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Stylus Color Pro"
+msgid "Print to a file"
+msgstr "Wydrukowaæ do pliku?"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr ""
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgid "Set Default"
+msgstr "Ustaw domy¶lne"
+
+#: 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 "OK"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/gutenprintui2/panel.c:642
+msgid "Select File..."
+msgstr ""
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Drukowanie v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Informacje o"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Ustawienia drukowania\n"
+"i zapisu"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Zapisz\n"
+"ustawienia"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Wydrukuj"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Podgl±d"
+
+#: 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
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "Jednolite p³aszczyzny"
+msgid "Paper Size"
+msgstr "Rozmiar"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Wymiary:"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Szeroko¶æ:"
+
+#: 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 "Wysoko¶æ:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1577
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Automatic Paper Size"
+msgstr "Rozmiar"
+
+#: 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/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:1638
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgid "Image Position"
+msgstr "Po³o¿enie"
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automatycznie"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Portret"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Pejza¿"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Z góry na dó³"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Pejza¿"
+
+#: 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 "U³o¿enie:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Lewa:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Odleg³o¶æ od lewej krawêdzi papieru do obrazu"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Prawa:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Odleg³o¶æ od lewej krawêdzi papieru do prawej krawêdzi obrazu"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Odleg³o¶æ od prawej krawêdzi papieru do obrazu"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Góra:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Odleg³o¶æ od górnej krawêdzi papieru do obrazu"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Dó³:"
+
+#: src/gutenprintui2/panel.c:1696
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Jednolite p³aszczyzny"
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Odleg³o¶æ od górnej krawêdzi papieru do dolnej krawêdzi obrazu"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Odleg³o¶æ od dolnej krawêdzi papieru do obrazu"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1713
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Stylus Color Pro"
+msgid "Horizontal"
+msgstr "Poziomo"
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Oba"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1719
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Stylus Color Pro"
+msgid "Vertical"
+msgstr "Pionowo"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:1757
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgid "Printer Make:"
+msgstr "Model drukarki:"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: 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 "Model drukarki:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "Plik PPD:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Przegl±daj"
+
+#: 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
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Stylus Photo"
+msgid "Printer Queue:"
+msgstr "Model drukarki:"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: 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/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1957
 #, fuzzy
-msgid "Photo Black"
-msgstr "Czarny"
+msgid "Print To File"
+msgstr "Wydrukowaæ do pliku?"
+
+#: 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/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2019
 #, fuzzy
-msgid "Matte Black"
+msgid "About Gutenprint "
+msgstr "Wydrukuj"
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Wydrukuj"
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Ustawienia drukarki"
+
+#: 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
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Ustaw domy¶lne"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Rozmiar"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Skalowanie:"
+
+#: 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 "Procent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+
+#: 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 "Regulacja koloru wydruku"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Ustaw domy¶lne"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Zamknij"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Podgl±d obrazu"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Typ wyj¶ciowy:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Typ wyj¶ciowy:"
+
+#: 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
+#, fuzzy
+msgid "Size Units:"
+msgstr "Jednostki:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Jednostki:"
+
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Wydrukuj"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Ustawienia drukarki"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Ustawienia drukarki"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Typ wyj¶ciowy:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Polecenie:"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr ""
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr ""
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr ""
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr ""
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Polish"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Rozmiar papieru:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Kolor"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Kolor"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+#, fuzzy
+msgid "CMY Color"
+msgstr "Kolor"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+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:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Mo¿na podaæ tylko jedn± drukarkê lub surowe urz±dzenie."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Mo¿na podaæ tylko jeden model drukarki."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Nieznana opcja %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Nie mo¿na wys³aæ polecenia do drukarki\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Nie mo¿na odczytaæ z %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Nieznana opcja %c\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Nie mo¿na zapisaæ do %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Nie mo¿na zapisaæ do %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
+#, fuzzy
+msgid "Photo Black"
 msgstr "Czarny"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
+
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "¯ó³æ"
+msgid "Matte Black"
+msgstr "Czarny"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Czarny"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
 #, fuzzy
-msgid "Plain Paper Fast Load"
-msgstr "Zwyk³y papier"
+msgid "Orange"
+msgstr "Rozmiar"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
-msgid "Postcard"
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
-msgid "Back Light Film"
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
-msgid "Matte Paper Heavyweight"
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Nasycenie:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Zwyk³y papier"
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-msgid "Archival Matte Paper"
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-#, fuzzy
-msgid "Print to CD"
-msgstr "Wydrukowaæ do pliku?"
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-msgid "Manual Sheet Guide"
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Typ wyj¶ciowy:"
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr ""
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Model drukarki:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Mo¿na podaæ tylko jeden model drukarki."
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Czyszczenie g³owic...\n"
+
+#: src/escputil/escputil.c:1770
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1774
+#, 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:1809
+#, 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:1853
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr ""
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1892
+#, 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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1913
+#, 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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr ""
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1937
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1942
+#, c-format
+msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1950
+#, 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:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr ""
+
+#: src/escputil/escputil.c:2026
+#, 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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr ""
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr ""
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2088
+#, 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:2134
+#, c-format
+msgid "Error in input\n"
+msgstr ""
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Drukowanie..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+msgid "Bright White Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
+msgid "Postcard"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
+msgid "Back Light Film"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
+msgid "Matte Paper Heavyweight"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:27
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:29
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
 #, fuzzy
-msgid "Photo Board"
-msgstr "Czarny"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:35
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
+#: src/xml/xmli18n-tmp.h:37
+msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr ""
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:41
+msgid "Premium Luster Photo Paper 250 wt"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
-msgid "360 x 90 DPI Fast Economy"
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+msgid "Ultra Premium Photo Paper Luster"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+#, fuzzy
+msgid "ColorLife Paper"
+msgstr "Zwyk³y papier"
+
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+#, fuzzy
+msgid "Plain Paper Fast Load"
+msgstr "Zwyk³y papier"
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+msgid "Archival Matte Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+#, fuzzy
+msgid "UltraChrome Photo Black"
+msgstr "Stylus Photo"
+
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
+msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "1440 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "1440 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 DPI"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-#, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "¯ó³æ"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "1440 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2922
+#, fuzzy
+msgid "Black 1"
+msgstr "Czarny"
+
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Czarny"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "1440 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
 #, fuzzy
-msgid "Interleave"
-msgstr "Ustawienia drukarki"
+msgid "Print to CD"
+msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Ustawienia drukarki"
+msgid "Manual Feed (Front)"
+msgstr "Typ wyj¶ciowy:"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3104
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Jasno¶æ:"
+msgid "Photo Board"
+msgstr "Czarny"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "Wysoko¶æ:"
+msgid "One Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
+msgid "Three Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Four Color Raw"
+msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
-msgstr "Stylus Photo"
+msgid "Five Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
+msgstr "Jednolite p³aszczyzny"
 
-#: src/main/generic-options.c:46
-msgid "Text"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "Jednolite p³aszczyzny"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
 #, fuzzy
-msgid "Photograph"
-msgstr "Fotografia"
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Jednolite p³aszczyzny"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Rysunek kresk±"
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+#, fuzzy
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3210
 #, fuzzy
-msgid "Page"
-msgstr "Rozmiar"
+msgid "Default Black"
+msgstr "Ustaw domy¶lne"
 
-#: src/main/generic-options.c:56
-msgid "Job"
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+#, fuzzy
+msgid "Seven Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Image Type"
-msgstr "Typ obrazu:"
+msgid "Seven Color Raw"
+msgstr "Stylus Color Pro"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+#, fuzzy
+msgid "Two Level Grayscale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+#, fuzzy
+msgid "Two Color Raw"
+msgstr "Jednolite p³aszczyzny"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Jednolite p³aszczyzny"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Jednolite p³aszczyzny"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Ustawienia drukarki"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Rozmiar"
+msgid "Interleave 2"
+msgstr "Ustawienia drukarki"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Rozmiar"
+msgid "Eight Pass"
+msgstr "Jasno¶æ:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Pejza¿"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Koperta"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Koperta"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-#, fuzzy
-msgid "Custom"
-msgstr "Automatycznie"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+msgid "17 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+msgid "60 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3742
+msgid "64 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Model drukarki:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Ustawienia drukarki"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Czarny"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Cal"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Wydrukuj"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Polecenie:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Plik"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Wydrukowaæ do pliku?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Ustaw domy¶lne"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Anuluj"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-msgid "Select File..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Drukowanie v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Informacje o"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Ustawienia drukowania\n"
-"i zapisu"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"Zapisz\n"
-"ustawienia"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Wydrukuj"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Podgl±d"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "Rozmiar"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Wymiary:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Szeroko¶æ:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Wysoko¶æ:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "Rozmiar"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Po³o¿enie"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automatycznie"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Portret"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Pejza¿"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Z góry na dó³"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Pejza¿"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "U³o¿enie:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Lewa:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Odleg³o¶æ od lewej krawêdzi papieru do obrazu"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Prawa:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Odleg³o¶æ od lewej krawêdzi papieru do prawej krawêdzi obrazu"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Odleg³o¶æ od prawej krawêdzi papieru do obrazu"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Góra:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Odleg³o¶æ od górnej krawêdzi papieru do obrazu"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Dó³:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Odleg³o¶æ od górnej krawêdzi papieru do dolnej krawêdzi obrazu"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Odleg³o¶æ od dolnej krawêdzi papieru do obrazu"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Poziomo"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Oba"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Pionowo"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Ustawienia drukarki"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Model drukarki:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Model drukarki:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "Plik PPD:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Przegl±daj"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Model drukarki:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Wydrukowaæ do pliku?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Wydrukuj"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Wydrukuj"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Ustawienia drukarki"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Ustaw domy¶lne"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Rozmiar"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Skalowanie:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Procent"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Regulacja koloru wydruku"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Ustaw domy¶lne"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Zamknij"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Podgl±d obrazu"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Typ wyj¶ciowy:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Typ wyj¶ciowy:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Jednostki:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Jednostki:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Wydrukuj"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Ustawienia drukarki"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Ustawienia drukarki"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Typ wyj¶ciowy:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Polecenie:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
 msgstr ""
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
 msgstr ""
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
 msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Polish"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin2"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
 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"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Mo¿na podaæ tylko jedn± drukarkê lub surowe urz±dzenie."
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Mo¿na podaæ tylko jeden model drukarki."
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Nieznana opcja %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Nie mo¿na wys³aæ polecenia do drukarki\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Nie mo¿na odczytaæ z %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
 msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Nieznana opcja %c\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Nie mo¿na zapisaæ do %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Nasycenie:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Ustawienia drukarki"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Mo¿na podaæ tylko jeden model drukarki."
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Czyszczenie g³owic...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
 msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
 msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 msgstr ""
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
 msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
 msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
 msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
 msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
 msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Drukowanie..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin2"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Odcienie szaro¶ci"
+
+#, fuzzy
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Stylus Color Pro"
+
+#, 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: No row buffer\n"
@@ -8762,9 +12768,6 @@ msgstr "Drukowanie..."
 #~ msgid "Media Type:"
 #~ msgstr "Typ papieru:"
 
-#~ msgid "Media Size:"
-#~ msgstr "Rozmiar papieru:"
-
 #~ msgid "Media Source:"
 #~ msgstr "¬ród³o papieru:"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 659b6c3..3dcf584 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index ea0d1c2..61377c4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,12 +1,12 @@
 # Portuguese translation of PACKAGE.
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Filipe Maia <fmaia@gmx.net>, 2002.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2002-10-16 19:24+0100\n"
 "Last-Translator: Filipe Maia <fmaia@gmx.net>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Definir Valores Padrão"
@@ -95,18 +95,19 @@ msgstr ""
 msgid "Density"
 msgstr "Densidade:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -165,9 +166,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamanho"
@@ -176,320 +177,367 @@ msgstr "Tamanho"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Definições da Impressora"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamanho do papel para o qual deseja imprimir"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Tipo de Média"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Fonte de Média"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Fonte do \"media\" para o qual está a imprimir"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, 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:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Resolução"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de tinta"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta na impressora"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 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:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel ColorLife"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+#, fuzzy
+msgid "Print Quality"
+msgstr "720 DPI Qualidade Máxima"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Preto e Branco"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Tipo de Output:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -524,9 +572,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
 
@@ -543,11 +590,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -613,7 +660,7 @@ msgid "Output image type"
 msgstr "Tipo de Output:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -682,16 +729,56 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -700,16 +787,56 @@ msgstr "Ciano"
 msgid "Adjust the cyan gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -718,16 +845,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Amarelo"
 
@@ -736,9 +903,11 @@ msgstr "Amarelo"
 msgid "Adjust the yellow gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -747,7 +916,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -756,9 +925,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -768,16 +938,54 @@ msgid "Adjust the blue gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Preto"
 
@@ -786,7 +994,7 @@ msgstr "Preto"
 msgid "Adjust the black gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -801,7 +1009,7 @@ msgstr "Escala de Cinzento"
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -811,7 +1019,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
@@ -843,10 +1051,11 @@ msgstr "Tipo de tinta"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de Output:"
@@ -855,27 +1064,27 @@ msgstr "Tipo de Output:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1021,505 +1230,570 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s não é um paràmetro válido do tipo %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impressora desconhecida %s\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s fora do intervalo (valor %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Tamanho da imagem não é válido\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Margem de topo não pode ser menor que zero\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Margem de topo não pode ser menor que zero\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
-msgid "Print Quality"
-msgstr "720 DPI Qualidade Máxima"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tipo de tinta"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Comando desconhecido.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Ciano"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Preto e Branco"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Ciano"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Densidade:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Tipo de Output:"
+msgid "Paper Thickness"
+msgstr "Tamanho"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Definir Valores Padrão"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Densidade:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Modelo da Impressora:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Papel Normal"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1572,129 +1846,356 @@ msgid "test print"
 msgstr "impressão de teste"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Quatro Cores Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Três Cores Compósito"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Seis Cores Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Cinco Cores Foto Compósito"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Papel Normal"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Transparências"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Outro"
 
@@ -1710,177 +2211,202 @@ msgstr "Manual com Pausa"
 msgid "Manual without Pause"
 msgstr "Manual sem Pausa"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "Filme Lustroso"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Mate"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Preto e Branco"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Simples"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Dobrado"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Foto Lustrosa"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Transparência"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Foto Secagem Rápida"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Transparência Secagem Rápida"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manual"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Tabuleiro 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Tabuleiro 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Tabuleiro 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Tabuleiro 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Alimentador de Folhas Portátil"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Alimentador de Folhas de Secretária"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Tabuleiro"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Fonte Alternativa"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monocromático"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Altura"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Cor + Preto"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Cartuchos Cor + Fotografia"
 
@@ -1889,6695 +2415,10187 @@ msgstr "Cartuchos Cor + Fotografia"
 msgid "PPDFile"
 msgstr "Ficheiro PPD:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "Ficheiro PPD?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Cancelar"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Carta"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Personalizado"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Escala de Cinzento de 2 Níveis"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-#, fuzzy
-msgid "Three Level Grayscale"
-msgstr "Escala de Cinzento de 2 Níveis"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quato Tons"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Four Color Photo"
+msgid "Ultra Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Seis Cores Compósito Realçado"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Foto de Sete Cores"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr ""
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Sete Cores Realçado"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:49
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Seis Cores Foto"
+msgid "Photograph"
+msgstr "Fotografia"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "\"Line Art\""
+
+#: src/main/generic-options.c:55
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Foto de Sete Cores"
+msgid "Page"
+msgstr "Tamanho"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr ""
 
-#: src/main/escp2-channels.c:1914
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Sete Cores Realçado"
+msgid "Image Type"
+msgstr "Tipo de Imagem:"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/main/generic-options.c:69
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "Quatro Cores Standard"
+msgid "Type of image being printed"
+msgstr "Tipo de tinta na impressora"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Três Cores Compósito"
+msgid "Page Number"
+msgstr "Tamanho"
 
-#: src/main/escp2-channels.c:1981
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Três Cores Compósito"
+msgid "Page number"
+msgstr "Tamanho"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/curve.c:130
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "Quatro Cores Standard"
+msgid "Curve type"
+msgstr "Preto"
+
+#: 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/main/escp2-channels.c:2147
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Polegada"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Definir como base das unidades de medida a polegada"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Definir como base das unidades de medida o centímetro"
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "Quatro Cores Standard"
+msgid "Points"
+msgstr "Imprimir"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Foto de Sete Cores"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Definir como base das unidades de medida a polegada"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Seis Cores Foto"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Seis Cores Compósito Realçado"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Definir como base das unidades de medida a polegada"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Ouput de cor"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Imprimir em sombras de cinzento usando tinta preta"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Foto de Sete Cores"
+msgid "Standard Command"
+msgstr "Standard"
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sete Cores Realçado"
+msgid "Custom Command"
+msgstr "Comando:"
+
+#: 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 "Ficheiro"
 
-#: src/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Seis Cores Foto"
+msgid "Print to a file"
+msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Seis Cores Foto"
+msgid "Set Default"
+msgstr "Definir Valores Padrão"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: 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 "OK"
+
+#: 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
+#, fuzzy
+msgid "Select File..."
+msgstr "Configurar Impressora..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr ""
+
+#: 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 "Acerca"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Imprimir e\n"
+"Gravar Definições"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr "Gravar Definições"
+
+#: 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 ""
+"Posição a imagem na página.\n"
+"Clique e arraste com o botão primário para a posição da imagem.\n"
+"Clique e arraste com o segundo botão para mover a imagem com maior "
+"precisão;\n"
+"cada unidade de movimento move a imagem um ponto (1/72\")\n"
+"Clique e arraste com o terceiro botão (o do meio) para mover a imagem em "
+"unidades\n"
+"de tamanho da imagem.\n"
+"Mantendo pressionado a tecla shift enquanto se clica e arrasta, restringe o "
+"movimento\n"
+"ao eixo horizontal e vertical.\n"
+"Se clicar noutro botão enquanto arrasta com o rato, a imagem vai voltar à "
+"sua\n"
+"posição original."
+
+#: src/gutenprintui2/panel.c:1522
+#, fuzzy
+msgid "Paper Size"
+msgstr "Tamanho"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Dimensões:"
+
+#: 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 "Largura do papel para o qual deseja 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 para o qual deseja imprimir"
+
+#: src/gutenprintui2/panel.c:1577
+#, fuzzy
+msgid "Automatic Paper Size"
+msgstr "Tamanho"
+
+#: 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
+#, fuzzy
+msgid "Image Position"
+msgstr "Posição"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Retrato"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Paisagem"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "De cabeça para baixo"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Paisagem de cabeça para baixo"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
+"de cabeça para baixo"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientação:"
+
+#: 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 "Distância da esquerda do papel até à imagem"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Direita:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Distência da esquerda do papel até à direita da imagem"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Distância da direita do papel até à imagem"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Topo:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Distência do topo do papel até à imagem"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Fundo:"
+
+#: src/gutenprintui2/panel.c:1696
+#, fuzzy
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Distância do topo do papel até ao fundo da imagem"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Distância do fundo do papel até à imagem"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centro:"
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "Horizontalmente"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centrar a imagem horizontalmente no papel"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Ambos"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centrar a imagem no papel"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "Verticalmente"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centrar a imagem verticalmente no papel"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Configurar a Impressora"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "Nome da Impressora:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "Seleccione o seu modelo de impressora"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Modelo da Impressora:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Seleccione o seu modelo de impressora"
+
+#: 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 "Insira o ficheiro PPD correct para a sua impressora"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Navegar"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Seleccione o ficheiro PPD correcto para a sua impressora"
+
+#: 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 ""
+"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
+"a qual deseja imprimir"
+
+#: src/gutenprintui2/panel.c:1914
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "Nome da Impressora:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "Insira o ficheiro PPD correct para a sua impressora"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "impressão de teste"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "Imprimir para o Ficheiro?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definir nova Impressora"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Nome da Impressora:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Insira o noma que deseja dar a esta impressora lógica"
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "Acerca do Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Versão do Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Definições da Impressora"
+
+#: 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 impressora (não o tipo ou modelo da impressora) para\n"
+"a qual deseja imprimir"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Configurar Impressora..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Escolha o modelo da impressora, ficheiro PPD, e comando que é usado para "
+"imprimir\n"
+"para esta impressora"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Nova Impressora..."
+
+#: 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 ""
+"Definir uma nova impressora lógica. Isto pode ser usado para denominar uma "
+"colecção de definições que você deseje guardar para uso futuro"
+
+#: src/gutenprintui2/panel.c:2150
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Definir Valores Padrão"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Tamanho"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Redimesionamento:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Definir a escala (tamanho) da imagem"
+
+#: 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 ""
+"Seleccione se a escala é medida em percentagem do tamanho de página "
+"disponível ou número de pontos por polegada na impressão"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Precentagem"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Redimensionar a impressão para o tamanho da página"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Redimensionar a impressão para o número de pontos por polegada"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Definir a largura da impressão"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Definir a altura da impressão"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Usar Original\n"
+"Tamanho de Imagem"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Definir como tamanho de impressão o tamanho da imagem"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Ajustamento da Cor de Impressão"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Definir Valores Padrão"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Fechar"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Previsualização da Imagem"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Tipo de Output:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Tipo de Output:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Seleccione o tipo de output desejado"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Ajustar o Output..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
+"\"dither\""
+
+#: src/gutenprintui2/panel.c:2523
+#, fuzzy
+msgid "Size Units:"
+msgstr "Unidades:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+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 "Seleccione a base das unidades de medida para impressão"
+
+#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
+msgid "System V lp"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Imprimir"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Configurar a Impressora"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Definições da Impressora"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Tipo de Output:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Comando:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "Tabuleiro 1"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "Tabuleiro 2"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "Tabuleiro 3"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "Tabuleiro 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Portuguese"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Tamanho do \"Media\":"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Cor"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Escala de Cinzento"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Cor"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "Cor CMY"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Versão de Escputil"
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"Copyright 2000 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"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\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 ""
+"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                    [-P printer | -r device] [-u] [-q] [-m model]\n"
+"Realiza manutenção em impressoras EPSON Styles (R).\n"
+"Exemplos: escputil --clean-head --printer stpex-on-third-floor\n"
+"          escputil --ink-level --new --raw-device /dev/lp0\n"
+"\n"
+"  Comandos:\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"
+"    -o|--align-color   Align the color print head (Stylus Color 480 and 580\n"
+"                       only).  CAUTION: Misuse of this utility may result "
+"in\n"
+"                       poor print quality and/or damage to the printer.\n"
+"    -s|--status        Retrieve printer status.\n"
+"    -i|--ink-level     Obtain the ink level from the printer.  This require\n"
+"                       read/write access to the raw 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"
+"  Opções:\n"
+"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
+"                       Default is the default system printer.\n"
+"    -r|--raw-device    Specify the name of the device to write to directly\n"
+"                       rather than going through a printer queue.\n"
+"    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
+"                       newer).\n"
+"    -q|--quiet         Suppress the banner.\n"
+"    -m|--model         Specify the precise printer model for head "
+"alignment.\n"
+
+#: src/escputil/escputil.c:162
+#, fuzzy
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\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 ""
+"Utilização: escputil [OPTIONS] [COMMAND]\n"
+"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                     [-P printer | -r device] [-u] [-q] [-m model]\n"
+"Realiza manutenção em impressoras EPSON Stylus (R).\n"
+"Exemplos: escputil -c -P stpex-on-third-floor\n"
+"          escputil -i -u -r /dev/lp0\n"
+"\n"
+"  Comandos:\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"
+"    -o Align the color print head (Stylus Color 480 and 580\n"
+"          only).  CAUTION: Misuse of this utility may result in\n"
+"          poor print quality and/or 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"
+"    -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"
+"    -q Suppress the banner.\n"
+"    -m Specify the precise printer model for head alignment.\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Você só pode especificar uma impresoora ou dispositivo"
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Você só pode especificar um modelo de impressora"
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Opção desconhecida %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Não foi possível abrir o dispositivo %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Não foi possível enviar comando para a impressora\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Não é possível ler a partir de %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Status da impressora requere a utilização de um dipositivo.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Opção desconhecida %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Não foi possível escrever para %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Não foi possível escrever para %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Não foi possível detecar o tipo de impressora.\n"
+"Por favor use a opção -m para especificar o modelo da sua impressora.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel de Fotografia"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "Papel Mate"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ciano Claro"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "Amarelo"
+msgid "Matte Black"
+msgstr "Papel Mate"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Preto"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Papel Normal Carregação Rápida"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Tamanho"
+
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Saturação:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Erro no input\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Erro no input\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Erro no input\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Cor da Tinta"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Percentagem restante"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Nome da Impressora:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Você só pode especificar um modelo de impressora"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Limpando as cabeças...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Por favor leia estas intruções muito cuidadosamente antes de prosseguir.\n"
+"\n"
+"Este programa permite alinhas a cabeça de impressão da sua impressora a "
+"jacto\n"
+"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
+"da\n"
+"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
+"não foi revisto\n"
+"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
+"O risco\n"
+"involvido na sua utilização recai totalmente sobre si.\n"
+"\n"
+"Este programa imprime %d padrões de teste. Cada parão parece muito "
+"semelhante.\n"
+"O padrão consiste num série de pares de linhas verticais que sobrepõem.\n"
+"Debaixo de cada par de linhas está um número entre %d e %d.\n"
+"\n"
+"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
+"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
+"Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n"
+"de uma lupa é recomendado para as inspecções mais críticas.\n"
+"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
+"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
+"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
+"volta\n"
+"no alimentador de papel antes de o teclar.\n"
+"\n"
+"Cada padrão é similar, mas os últimos padrões usam pontos mais finos para "
+"alinhamentos\n"
+"mais críticos. Deve correr todas as passagens para alinhar correctamente a "
+"sua\n"
+"impressora. Após correr todas as passagens de alinhamento, os padrões de "
+"alinhamento\n"
+"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
+"%d) é\n"
+"o melhor de todos os padrões.\n"
+"\n"
+"Após as passagens serem imprimidas mais ima vez, vão dar-lhe a opção\n"
+"de gravar as escolhas na impressora, repetir o processo, ou sair sem "
+"gravar.\n"
+"Sair não vai restaurar as definições anteriores, mas desligar aimpressora e\n"
+"voltar a ligar vai. Se sair deve repetir o processo inteiro se desejar "
+"gravar\n"
+"os resultados. É essencial que você não desligue a impressora durante este "
+"procedimento.\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Por favor leia estas intrucções muito cuidadosamente antes de prosseguir.\n"
+"\n"
+"Este programa permite alinhas a cabeça de impressão da sua impressora a "
+"jacto\n"
+"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
+"da\n"
+"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
+"não foi revisto\n"
+"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
+"O risco\n"
+"involvido na sua utilização recai totalmente sobre si.\n"
+"\n"
+"Este programa imprime um padrao que consiste num série de pares de linhas "
+"verticais que sobrepõem.\n"
+"Debaixo de cada par de linhas está um número entre %d e %d.\n"
+"\n"
+"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
+"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
+"Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n"
+"de uma lupa é recomendado para as inspecções mais críticas.\n"
+"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
+"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
+"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
+"volta\n"
+"no alimentador de papel antes de o teclar.\n"
+"\n"
+"Após correr todas as passagens de alinhamento, os padrões de alinhamento\n"
+"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
+"%d) é\n"
+"o melhor de todos os padrões.\n"
+"\n"
+"Agora ser-lhe-á dada a opção de gravar as escolhas na impressora, repetir o "
+"processo,\n"
+"ou sair sem gravar. Sair não vai restaurar as definições anteriores, mas "
+"desligar a\n"
+"impressora e voltar a ligar vai. Se sair deve repetir o processo inteiro se "
+"desejar gravar\n"
+"os resultados. É essencial que você não desligue a impressora durante este "
+"procedimento.\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Por favor inspeccione o output final muito cuidadosamente para se assegurar\n"
+"que a sua impressora tem um alinhamento correcto. Você pode agora:\n"
+"  (s) gravar os resultados na impressora,\n"
+"  (q) sair sem gravar os resultados, ou\n"
+"  (r) repetir o processo inteiro desde o início.\n"
+"Vai-lhe ser pedido para confirmar a sua escolha.\n"
+"O que é que pretende fazer (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
+"o processo de alinhamento:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Repetindo o processo de alinhamento.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 vai alterar permanentemente a configuração da sua impressora.\n"
+"AVISO: este procedimento não foi aprovado pela Seiko Epson, e pode\n"
+"danificar a sua impressora. Prosseguir?\n"
+"Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
+"as configurações para a sua impressora:\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Prestes a gravar as configurações..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "falhou!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"A suas configurações não foram gravados com sucesso.\n"
+"Vai ter de repetir o processo de alinhamento.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "sucesso!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Comando desconhecido.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "O comando final não foi confirmado.\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 ""
+"Este procedimento assume que a sua impressora é uma Epson %s.\n"
+"Se este não é o seu modelo de impressora, por favor carregue em control-C\n"
+"agora e escolha o seu modelo de impressora.\n"
+"\n"
+"Por favor coloque uma folha de papel na impressora para iniciar\n"
+"o processo de alinhamento da cabeça.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Pressione enter para continuar > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"Por favor inspeccione a impressão, e escolha o melhor par de linhas em cada "
+"padrão.\n"
+"Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Passagem #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, 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:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Número fora do intervalo|\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Eu não consigo intender o que escreveu!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Tentando definir o alinhamento..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "sucesso.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Por favor verifique que o alinhamento é correcto. Após padrão de "
+"alinhamento\n"
+"ser impresso outra vez, por favor certifique-se qye o melhor padrão para "
+"cada linha\n"
+"é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
+"qualidade de impressão.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Erro no input\n"
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Papel Mate"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Cartão"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr "Película"
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
-msgstr "Papel de Fotografia Lustroso Premium"
+msgid "Premium Presentation Paper Matte"
+msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Papel ColorLife"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Papel Mate"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Rolo de Alimentação"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr ""
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papel de Fotografia Lustroso"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
+msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Manual"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "Imprimir para o Ficheiro?"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manual"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manual"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Tabuleiro"
+msgid "ColorLife Paper"
+msgstr "Papel ColorLife"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quato Tons"
 
-#: src/main/escp2-papers.c:1988
-#, fuzzy
-msgid "Photo Board"
-msgstr "Papel de Fotografia"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Papel Normal Carregação Rápida"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Auto Seleccionar"
+msgid "UltraChrome Photo Black"
+msgstr "Seis Cores Foto"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI monocromático"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "1440 x 360 DPI Alta Qualidade"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
 #, fuzzy
-msgid "720 DPI High Quality"
-msgstr "1200 DPI alta qualidade"
+msgid "360 x 120 DPI Economy"
+msgstr "600x600 DPI monocromático"
 
-#: src/main/escp2-resolutions.c:103
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 DPI Highest Quality"
-msgstr "1200 DPI qualidade máxima"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 DPI"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "720 DPI High Quality"
+msgstr "1200 DPI alta qualidade"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
 #, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgid "720 DPI Highest Quality"
+msgstr "1200 DPI qualidade máxima"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "Amarelo"
+
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "Nome da Impressora:"
+msgid "Black 1"
+msgstr "Preto"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Preto"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Tabuleiro"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manual"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "Imprimir para o Ficheiro?"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Rolo de Alimentação"
+
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Nome da Impressora:"
+msgid "Manual Sheet Guide"
+msgstr "Manual"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Brilho:"
+msgid "Manual Feed (Front)"
+msgstr "Manual"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Papel de Fotografia"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Auto Seleccionar"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "Altura"
+msgid "One Color Raw"
+msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
+msgid "Three Color Raw"
+msgstr "Três Cores Compósito"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Four Color Raw"
+msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
+msgid "Five Color Raw"
+msgstr "Foto de Sete Cores"
+
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+#, fuzzy
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Sete Cores Realçado"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Três Cores Compósito"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "Quatro Cores Standard"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+#, fuzzy
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
 #, fuzzy
-msgid "Photograph"
-msgstr "Fotografia"
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Sete Cores Realçado"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "\"Line Art\""
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "Definir Valores Padrão"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Foto de Sete Cores"
+
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Seis Cores Compósito Realçado"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Page"
-msgstr "Tamanho"
+msgid "Seven Color Raw"
+msgstr "Foto de Sete Cores"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
 #, fuzzy
-msgid "Image Type"
-msgstr "Tipo de Imagem:"
+msgid "Two Color Raw"
+msgstr "Quatro Cores Standard"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Tipo de tinta na impressora"
+msgid "Eight Color Photo"
+msgstr "Seis Cores Foto"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Seis Cores Foto"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Seis Cores Foto"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Nome da Impressora:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Tamanho"
+msgid "Interleave 2"
+msgstr "Nome da Impressora:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Tamanho"
+msgid "Eight Pass"
+msgstr "Brilho:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Carta"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executivo"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel de Fotografia Epson 4x6"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x8"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIs"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Paisagem"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Papel Ministro Americano"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Papel Ministro Europeu"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Pequena Brochura"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Pequena Brochura Pinguim"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Grande Brochura Pinguim"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Cartão Hagaki"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Cartão Oufuku"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Envelope longo Japonês #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Envelope longo Japonês #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Envelope longo Japonês #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Envelope longo Japonês #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Evelope Kaku Japonês #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Evelope Kaku Japonês #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Comercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "Convite A2"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Envelope Monarca"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Envelope Monarca"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Cartão"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "Papel Contínuo 89 mm"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "Papel Contínuo 5 Polegadas"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "Papel Contínuo 210 mm"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "Papel Contínuo 13 Polegadas"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "Papel Contínuo 22 Polegadas"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "Papel Contínuo 24 Polegadas"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "Papel Contínuo 44 Polegadas"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "Papel Contínuo 36 Polegadas"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "Papel Contínuo 4 Polegadas"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C42ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C42ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nome da Impressora:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Configurar a Impressora"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Preto"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Polegada"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Definir como base das unidades de medida a polegada"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Definir como base das unidades de medida o centímetro"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Imprimir"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Definir como base das unidades de medida a polegada"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Definir como base das unidades de medida o centímetro"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Definir como base das unidades de medida a polegada"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Ouput de cor"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Imprimir em sombras de cinzento usando tinta preta"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "Standard"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Comando:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Ficheiro"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Imprimir para o Ficheiro?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Definir Valores Padrão"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Configurar Impressora..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Imprimir v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Acerca"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Imprimir e\n"
-"Gravar Definições"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
-msgstr "Gravar Definições"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Imprimir"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Previsualizar"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"Posição a imagem na página.\n"
-"Clique e arraste com o botão primário para a posição da imagem.\n"
-"Clique e arraste com o segundo botão para mover a imagem com maior "
-"precisão;\n"
-"cada unidade de movimento move a imagem um ponto (1/72\")\n"
-"Clique e arraste com o terceiro botão (o do meio) para mover a imagem em "
-"unidades\n"
-"de tamanho da imagem.\n"
-"Mantendo pressionado a tecla shift enquanto se clica e arrasta, restringe o "
-"movimento\n"
-"ao eixo horizontal e vertical.\n"
-"Se clicar noutro botão enquanto arrasta com o rato, a imagem vai voltar à "
-"sua\n"
-"posição original."
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "Tamanho"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Dimensões:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Largura:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Largura do papel para o qual deseja imprimir"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Altura"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Altura do papel para o qual deseja imprimir"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "Tamanho"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Posição"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Auto"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Retrato"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Paisagem"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "De cabeça para baixo"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Paisagem de cabeça para baixo"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
-"Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
-"de cabeça para baixo"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientação:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Esquerda:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Distância da esquerda do papel até à imagem"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Direita:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Distência da esquerda do papel até à direita da imagem"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Distância da direita do papel até à imagem"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Topo:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Distência do topo do papel até à imagem"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Fundo:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Distância do topo do papel até ao fundo da imagem"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Distância do fundo do papel até à imagem"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centro:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Horizontalmente"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centrar a imagem horizontalmente no papel"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Ambos"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centrar a imagem no papel"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Verticalmente"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centrar a imagem verticalmente no papel"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Configurar a Impressora"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Nome da Impressora:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "Seleccione o seu modelo de impressora"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Modelo da Impressora:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Seleccione o seu modelo de impressora"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "Ficheiro PPD:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Insira o ficheiro PPD correct para a sua impressora"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Navegar"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Seleccione o ficheiro PPD correcto para a sua impressora"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-#, fuzzy
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
-"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
-"a qual deseja imprimir"
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Nome da Impressora:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "Insira o ficheiro PPD correct para a sua impressora"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "impressão de teste"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Imprimir para o Ficheiro?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Definir nova Impressora"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Nome da Impressora:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Insira o noma que deseja dar a esta impressora lógica"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "Acerca do Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Versão do Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Definições da Impressora"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
-"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
-"a qual deseja imprimir"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Configurar Impressora..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
-"Escolha o modelo da impressora, ficheiro PPD, e comando que é usado para "
-"imprimir\n"
-"para esta impressora"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Nova Impressora..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
-"Definir uma nova impressora lógica. Isto pode ser usado para denominar uma "
-"colecção de definições que você deseje guardar para uso futuro"
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Definir Valores Padrão"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Tamanho"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Redimesionamento:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Definir a escala (tamanho) da imagem"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
-"Seleccione se a escala é medida em percentagem do tamanho de página "
-"disponível ou número de pontos por polegada na impressão"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Precentagem"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Redimensionar a impressão para o tamanho da página"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Redimensionar a impressão para o número de pontos por polegada"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Definir a largura da impressão"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Definir a altura da impressão"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"Usar Original\n"
-"Tamanho de Imagem"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Definir como tamanho de impressão o tamanho da imagem"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Ajustamento da Cor de Impressão"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Definir Valores Padrão"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Fechar"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Previsualização da Imagem"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Tipo de Output:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Tipo de Output:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Seleccione o tipo de output desejado"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Ajustar o Output..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
-"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
-"\"dither\""
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Unidades:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Unidades:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Seleccione a base das unidades de medida para impressão"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Imprimir"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Configurar a Impressora"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Definições da Impressora"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Tipo de Output:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Comando:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "Tabuleiro 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "Tabuleiro 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "Tabuleiro 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "Tabuleiro 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Portuguese"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Versão de Escputil"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
-"Copyright 2000 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"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
-"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                    [-P printer | -r device] [-u] [-q] [-m model]\n"
-"Realiza manutenção em impressoras EPSON Styles (R).\n"
-"Exemplos: escputil --clean-head --printer stpex-on-third-floor\n"
-"          escputil --ink-level --new --raw-device /dev/lp0\n"
-"\n"
-"  Comandos:\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"
-"    -o|--align-color   Align the color print head (Stylus Color 480 and 580\n"
-"                       only).  CAUTION: Misuse of this utility may result "
-"in\n"
-"                       poor print quality and/or damage to the printer.\n"
-"    -s|--status        Retrieve printer status.\n"
-"    -i|--ink-level     Obtain the ink level from the printer.  This require\n"
-"                       read/write access to the raw 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"
-"  Opções:\n"
-"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
-"                       Default is the default system printer.\n"
-"    -r|--raw-device    Specify the name of the device to write to directly\n"
-"                       rather than going through a printer queue.\n"
-"    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
-"                       newer).\n"
-"    -q|--quiet         Suppress the banner.\n"
-"    -m|--model         Specify the precise printer model for head "
-"alignment.\n"
 
-#: src/escputil/escputil.c:162
-#, fuzzy
-msgid ""
-"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
-"Utilização: escputil [OPTIONS] [COMMAND]\n"
-"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                     [-P printer | -r device] [-u] [-q] [-m model]\n"
-"Realiza manutenção em impressoras EPSON Stylus (R).\n"
-"Exemplos: escputil -c -P stpex-on-third-floor\n"
-"          escputil -i -u -r /dev/lp0\n"
-"\n"
-"  Comandos:\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"
-"    -o Align the color print head (Stylus Color 480 and 580\n"
-"          only).  CAUTION: Misuse of this utility may result in\n"
-"          poor print quality and/or 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"
-"    -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"
-"    -q Suppress the banner.\n"
-"    -m Specify the precise printer model for head alignment.\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Você só pode especificar uma impresoora ou dispositivo"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Você só pode especificar um modelo de impressora"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Opção desconhecida %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Não foi possível abrir o dispositivo %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Não foi possível enviar comando para a impressora\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Não é possível ler a partir de %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "Status da impressora requere a utilização de um dipositivo.\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Opção desconhecida %s\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Não foi possível escrever para %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"Não foi possível detecar o tipo de impressora.\n"
-"Por favor use a opção -m para especificar o modelo da sua impressora.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Saturação:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "Erro no input\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "Erro no input\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Configurar a Impressora"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Cor da Tinta"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Percentagem restante"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Você só pode especificar um modelo de impressora"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Limpando as cabeças...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
 msgstr ""
-"A testar a agulha, por favor assegure-se que existe papel na impressora.\n"
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
-"Por favor leia estas intruções muito cuidadosamente antes de prosseguir.\n"
-"\n"
-"Este programa permite alinhas a cabeça de impressão da sua impressora a "
-"jacto\n"
-"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
-"da\n"
-"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
-"não foi revisto\n"
-"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
-"O risco\n"
-"involvido na sua utilização recai totalmente sobre si.\n"
-"\n"
-"Este programa imprime %d padrões de teste. Cada parão parece muito "
-"semelhante.\n"
-"O padrão consiste num série de pares de linhas verticais que sobrepõem.\n"
-"Debaixo de cada par de linhas está um número entre %d e %d.\n"
-"\n"
-"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
-"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
-"Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n"
-"de uma lupa é recomendado para as inspecções mais críticas.\n"
-"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
-"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
-"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
-"volta\n"
-"no alimentador de papel antes de o teclar.\n"
-"\n"
-"Cada padrão é similar, mas os últimos padrões usam pontos mais finos para "
-"alinhamentos\n"
-"mais críticos. Deve correr todas as passagens para alinhar correctamente a "
-"sua\n"
-"impressora. Após correr todas as passagens de alinhamento, os padrões de "
-"alinhamento\n"
-"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
-"%d) é\n"
-"o melhor de todos os padrões.\n"
-"\n"
-"Após as passagens serem imprimidas mais ima vez, vão dar-lhe a opção\n"
-"de gravar as escolhas na impressora, repetir o processo, ou sair sem "
-"gravar.\n"
-"Sair não vai restaurar as definições anteriores, mas desligar aimpressora e\n"
-"voltar a ligar vai. Se sair deve repetir o processo inteiro se desejar "
-"gravar\n"
-"os resultados. É essencial que você não desligue a impressora durante este "
-"procedimento.\n"
-"\n"
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
-"Por favor leia estas intrucções muito cuidadosamente antes de prosseguir.\n"
-"\n"
-"Este programa permite alinhas a cabeça de impressão da sua impressora a "
-"jacto\n"
-"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
-"da\n"
-"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
-"não foi revisto\n"
-"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
-"O risco\n"
-"involvido na sua utilização recai totalmente sobre si.\n"
-"\n"
-"Este programa imprime um padrao que consiste num série de pares de linhas "
-"verticais que sobrepõem.\n"
-"Debaixo de cada par de linhas está um número entre %d e %d.\n"
-"\n"
-"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
-"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
-"Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n"
-"de uma lupa é recomendado para as inspecções mais críticas.\n"
-"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
-"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
-"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
-"volta\n"
-"no alimentador de papel antes de o teclar.\n"
-"\n"
-"Após correr todas as passagens de alinhamento, os padrões de alinhamento\n"
-"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
-"%d) é\n"
-"o melhor de todos os padrões.\n"
-"\n"
-"Agora ser-lhe-á dada a opção de gravar as escolhas na impressora, repetir o "
-"processo,\n"
-"ou sair sem gravar. Sair não vai restaurar as definições anteriores, mas "
-"desligar a\n"
-"impressora e voltar a ligar vai. Se sair deve repetir o processo inteiro se "
-"desejar gravar\n"
-"os resultados. É essencial que você não desligue a impressora durante este "
-"procedimento.\n"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
-"Por favor inspeccione o output final muito cuidadosamente para se assegurar\n"
-"que a sua impressora tem um alinhamento correcto. Você pode agora:\n"
-"  (s) gravar os resultados na impressora,\n"
-"  (q) sair sem gravar os resultados, ou\n"
-"  (r) repetir o processo inteiro desde o início.\n"
-"Vai-lhe ser pedido para confirmar a sua escolha.\n"
-"O que é que pretende fazer (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 msgstr ""
-"Por favor confirme carregando em 'q' outra vez se deseja sair sem gravar:\n"
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 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:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
-"Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
-"o processo de alinhamento:\n"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Repetindo o processo de alinhamento.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
-"Isto vai alterar permanentemente a configuração da sua impressora.\n"
-"AVISO: este procedimento não foi aprovado pela Seiko Epson, e pode\n"
-"danificar a sua impressora. Prosseguir?\n"
-"Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
-"as configurações para a sua impressora:\n"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Prestes a gravar as configurações..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "falhou!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 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:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "sucesso!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
 msgstr ""
-"As suas configurações do alinhamento foram gravadas para a impressora.\n"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Comando desconhecido.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "O comando final não foi confirmado.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
-"Este procedimento assume que a sua impressora é uma Epson %s.\n"
-"Se este não é o seu modelo de impressora, por favor carregue em control-C\n"
-"agora e escolha o seu modelo de impressora.\n"
-"\n"
-"Por favor coloque uma folha de papel na impressora para iniciar\n"
-"o processo de alinhamento da cabeça.\n"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Pressione enter para continuar > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 msgstr ""
-"Por favor inspeccione a impressão, e escolha o melhor par de linhas em cada "
-"padrão.\n"
-"Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Passagem #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Por favor insira uma nova folha de papel.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Número fora do intervalo|\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Eu não consigo intender o que escreveu!\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "O melhor par de linhasdeve estar numerado entre 1 e %d.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Tentando definir o alinhamento..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "sucesso.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
-"Por favor verifique que o alinhamento é correcto. Após padrão de "
-"alinhamento\n"
-"ser impresso outra vez, por favor certifique-se qye o melhor padrão para "
-"cada linha\n"
-"é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
-"qualidade de impressão.\n"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Erro no input\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Imprimindo..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Escala de Cinzento de 2 Níveis"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Sete Cores Realçado"
+
+#, 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"
@@ -8774,18 +12792,12 @@ msgstr "Imprimindo..."
 #~ msgid "High Gloss Film"
 #~ msgstr "Filme Muito Lustroso"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Papel de Fotografia Lustroso"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Cartões de Fotografia Lustrosos"
 
 #~ msgid "Photo Paper Pro"
 #~ msgstr "Papel de Fotografia Profissional"
 
-#~ msgid "CMY Color"
-#~ msgstr "Cor CMY"
-
 #~ msgid "CMYK Color"
 #~ msgstr "Cor CMYK"
 
@@ -9408,9 +13420,6 @@ msgstr "Imprimindo..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Tipo de \"meida\" para o qual está a imprimir"
 
-#~ msgid "Media Size:"
-#~ msgstr "Tamanho do \"Media\":"
-
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "Tamanho do papel para o qual deseja imprimir"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index 90c771e..5f44e8b 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 6ef48c2..4471523 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GIMP Print\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2002-05-20 18:08+0100\n"
 "Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -19,7 +19,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Nastavi» ¹tandardné"
@@ -98,18 +98,19 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -168,9 +169,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Veµkos»"
@@ -179,320 +180,367 @@ msgstr "Veµkos»"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, 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:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Rozlí¹enie"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Rozlí¹enie a kvalita tlaèe"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ atramentu"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ atramentu tlaèiarne"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 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:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+#, fuzzy
+msgid "Print Quality"
+msgstr "720 DPI Najvy¹¹ia kvalita"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurová"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Jasná purpurová"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastný"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Èiernobielo"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Typ výstupu:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "©tandardný"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -527,9 +575,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Tlaèi»"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "V odtieòoch ¹edej"
 
@@ -546,11 +593,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr ""
 
@@ -616,7 +663,7 @@ msgid "Output image type"
 msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -684,16 +731,56 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Azúrová"
 
@@ -702,16 +789,56 @@ msgstr "Azúrová"
 msgid "Adjust the cyan gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Purpurová"
 
@@ -720,16 +847,56 @@ msgstr "Purpurová"
 msgid "Adjust the magenta gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "®ltá"
 
@@ -738,9 +905,11 @@ msgstr "®ltá"
 msgid "Adjust the yellow gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr ""
 
@@ -749,7 +918,7 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr ""
 
@@ -758,9 +927,10 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr ""
 
@@ -770,16 +940,54 @@ msgid "Adjust the blue gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Èierna"
 
@@ -788,7 +996,7 @@ msgstr "Èierna"
 msgid "Adjust the black gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr ""
 
@@ -803,7 +1011,7 @@ msgstr "V odtieòoch ¹edej"
 msgid "Adjust the cyan gray balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurová"
@@ -813,7 +1021,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
@@ -845,10 +1053,11 @@ msgstr "Typ atramentu"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ výstupu:"
@@ -857,27 +1066,27 @@ msgstr "Typ výstupu:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1023,505 +1232,570 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s nie je platný parameter pre typ %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznáma tlaèiareò %s\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s mimo rozsahu (hodnota %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Veµkos» obrázka nie je platná\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Horný okraj nemô¾e by» men¹í ako nula\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horný okraj nemô¾e by» men¹í ako nula\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
-msgid "Print Quality"
-msgstr "720 DPI Najvy¹¹ia kvalita"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozlí¹enie a kvalita tlaèe"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ atramentu"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Neznámy príkaz.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
 msgid "Channel Names"
 msgstr "Storno"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Azúrová"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurová"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Yellow Map"
 msgstr "®ltá"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Blue Map"
 msgstr "Èiernobielo"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Azúrová"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Hustota:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+
+#: src/main/print-escp2.c:495
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý film"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "®ltá"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "®ltá"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Typ výstupu:"
+msgid "Paper Thickness"
+msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Nastavi» ¹tandardné"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Hustota:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Model tlaèiarne:"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Obyèajný papier"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "©tandardný"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1574,129 +1848,356 @@ msgid "test print"
 msgstr "Test tlaèe"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "©tandardný ¹tvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický pä»farebný"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Obyèajný papier"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Lesklý film"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Priesvitná fólia"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Papier pre atramentovú tlaèiareò"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotografický papier"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Ligotavý foto papier Premium"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý fotografický papier"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Ilford »a¾ký papier"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Iné"
 
@@ -1712,177 +2213,202 @@ msgstr "Manuálne s preru¹ením"
 msgid "Manual without Pause"
 msgstr "Manuálne bez preru¹enia"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý film"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papier"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 #, fuzzy
 msgid "Black Balance"
 msgstr "Èiernobielo"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Jednoduchá"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Lesklé foto"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Priesvitné fólie"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Rýchloschnúce foto"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Rýchloschnúce priesvit. fólie"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manuál"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Zásobník 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Zásobník 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Zásobník 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Zásobník 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Prenosný podávaè papiera"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Stolový podávaè papiera"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Zásobník"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Voliteµný zdroj"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Automatický výber"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monochromaticky"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+#, fuzzy
+msgid "High"
+msgstr "Vý¹ka:"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Farebná + èierna kazeta"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Farebná + Foto kazeta"
 
@@ -1891,6686 +2417,10178 @@ msgstr "Farebná + Foto kazeta"
 msgid "PPDFile"
 msgstr "PPD súbor:"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD súbor?"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Storno"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Vlastný"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
 #, fuzzy
-msgid "Two Level Grayscale"
-msgstr "V odtieòoch ¹edej"
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "V odtieòoch ¹edej"
+msgid "Ultra Photo"
+msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
+
+#: src/main/generic-options.c:46
+msgid "Text"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
+#: 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
 #, fuzzy
-msgid "Four Color Photo"
-msgstr "Fotografický ¹es»farebný"
+msgid "Photograph"
+msgstr "Fotografia"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Kompozitný roz¹írený ¹es»farebný"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Èiarová grafika"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
+#: src/main/generic-options.c:55
 #, fuzzy
-msgid "Seven Color Photo"
-msgstr "Fotografický ¹es»farebný"
+msgid "Page"
+msgstr "Veµkos»"
 
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Roz¹írený sedemfarebný"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr ""
 
-#: src/main/escp2-channels.c:1742
+#: src/main/generic-options.c:68
 #, fuzzy
-msgid "Eight Color Photo"
-msgstr "Fotografický ¹es»farebný"
+msgid "Image Type"
+msgstr "Typ obrázku:"
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
+#: src/main/generic-options.c:69
 #, fuzzy
-msgid "One Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgid "Type of image being printed"
+msgstr "Typ atramentu tlaèiarne"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
 
-#: src/main/escp2-channels.c:1914
+#: src/main/generic-options.c:80
 #, fuzzy
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Roz¹írený sedemfarebný"
+msgid "Page Number"
+msgstr "Veµkos»"
 
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
+#: src/main/generic-options.c:81
 #, fuzzy
-msgid "Two Color Raw"
-msgstr "©tandardný ¹tvorfarebný"
+msgid "Page number"
+msgstr "Veµkos»"
 
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
+#: src/gutenprintui2/curve.c:130
 #, fuzzy
-msgid "Three Color Raw"
-msgstr "Kompozitný trojfarebný"
+msgid "Curve type"
+msgstr "Èierna"
+
+#: 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/main/escp2-channels.c:1981
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "palce"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Nastavi» palce ako základnú mernú jednotku"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Nastavi» centimetre ako základnú mernú jednotku"
+
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Three Color Raw Gloss"
-msgstr "Kompozitný trojfarebný"
+msgid "Points"
+msgstr "Tlaèi»"
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
+#: src/gutenprintui2/panel.c:280
 #, fuzzy
-msgid "Four Color Raw"
-msgstr "©tandardný ¹tvorfarebný"
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Nastavi» palce ako základnú mernú jednotku"
 
-#: src/main/escp2-channels.c:2147
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:282
 #, fuzzy
-msgid "Four Color Raw Gloss"
-msgstr "©tandardný ¹tvorfarebný"
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Nastavi» centimetre ako základnú mernú jednotku"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr ""
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
+#: src/gutenprintui2/panel.c:284
 #, fuzzy
-msgid "Five Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Nastavi» palce ako základnú mernú jednotku"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Farebný výstup"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Tlaèi» v odtieòoch ¹edej s pou¾itím èiernej farby"
 
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
+#: src/gutenprintui2/panel.c:305
 #, fuzzy
-msgid "Six Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgid "Standard Command"
+msgstr "©tandardný"
 
-#: src/main/escp2-channels.c:2239
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:306
 #, fuzzy
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Kompozitný roz¹írený ¹es»farebný"
+msgid "Custom Command"
+msgstr "Príkaz:"
+
+#: 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 "Súbor"
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
+#: src/gutenprintui2/panel.c:307
 #, fuzzy
-msgid "Seven Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgid "Print to a file"
+msgstr "Tlaèi» do súboru?"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr ""
 
-#: src/main/escp2-channels.c:2317
+#: src/gutenprintui2/panel.c:534
 #, fuzzy
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Roz¹írený sedemfarebný"
+msgid "Set Default"
+msgstr "Nastavi» ¹tandardné"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr ""
 
-#: src/main/escp2-channels.c:2335
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+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 "Storno"
+
+#: src/gutenprintui2/panel.c:642
 #, fuzzy
-msgid "Eight Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgid "Select File..."
+msgstr "Nastavenie tlaèiarne..."
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Tlaè v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "O programe"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Ulo¾i» nastavenia\n"
+"a vytlaèi»"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Ulo¾i»\n"
+"nastavenia"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Tlaèi»"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Náhµad"
+
+#: 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 ""
+"Pozícia obrázku na strane.\n"
+"Kliknite a potiahnite primárne tlaèítko na pozíciu obrázku.\n"
+"Kliknite a potiahnite sekundárne tlaèítko pohybu obrázku s jemnej¹ou "
+"presnos»ou; ka¾dá jednotka pohybu posunie obrázok o jeden bod (1/72\")\n"
+"Kliknite a potiahnite so stredným tlaèítkom na pohyb v jednotkách veµkosti "
+"obrázku.\n"
+"Ak pri klikaní a »ahaní podr¾íte klávesu Shift obmedzíte pohyb obrázku iba "
+"na vodorovný a zvislý pohyb.\n"
+"Ak poèas »ahania obrázku my¹ou kliknete iným tlaèítkom, obrázok sa vráti na "
+"pôvodnú pozíciu."
+
+#: src/gutenprintui2/panel.c:1522
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Fotografický ¹es»farebný"
+msgid "Paper Size"
+msgstr "Veµkos»"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Rozmery:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "©írka:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "©írka papiera, na ktorý chcete tlaèi»"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Vý¹ka:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»"
+
+#: src/gutenprintui2/panel.c:1577
+#, fuzzy
+msgid "Automatic Paper Size"
+msgstr "Veµkos»"
+
+#: 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
+#, fuzzy
+msgid "Image Position"
+msgstr "Pozícia"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automaticky"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Na vý¹ku"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Na ¹írku"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Hore nohami"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Na ¹írku"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Zvoµte orientáciu: na vý¹ku, na ¹írku, hore nohami, na ¹írku hore nohami "
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientácia:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "¥avý:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Vzdialenos» od µavého okraja papiera k obrázku"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Pravý:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Vzdialenos» od µavého okraja papiera k pravému okraju obrázku"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Vzdialenos» od pravého okraja papiera k obrázku"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Horný:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Vzdialenos» od horného okraja papiera k obrázku"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Dolný:"
+
+#: src/gutenprintui2/panel.c:1696
+#, fuzzy
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Vzdialenos» od horného okraja papiera k dolnému okraju obrázku"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Vzdialenos» od dolného okraja papiera k obrázku"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centrovanie:"
+
+#: src/gutenprintui2/panel.c:1713
+#, fuzzy
+msgid "Horizontal"
+msgstr "Vodorovne"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Vycentrova» vodorovne obrázok na papieri"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Oboje"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Vycentrova» obrázok na papieri"
+
+#: src/gutenprintui2/panel.c:1719
+#, fuzzy
+msgid "Vertical"
+msgstr "Zvislo"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Vycentrova» obrázok zvisle na papieri"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Nastavi» tlaèiareò"
+
+#: src/gutenprintui2/panel.c:1757
+#, fuzzy
+msgid "Printer Make:"
+msgstr "Názov tlaèiarne:"
+
+#: src/gutenprintui2/panel.c:1768
+#, fuzzy
+msgid "Select the make of your printer"
+msgstr "Vyberte model va¹ej tlaèiarne"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Model tlaèiarne:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Vyberte model va¹ej tlaèiarne"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD súbor:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Prechádza»"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Zvoµte správny PPD názov súboru pre va¹u tlaèiareò"
+
+#: src/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 ""
+"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
+"tlaèi»"
+
+#: src/gutenprintui2/panel.c:1914
+#, fuzzy
+msgid "Printer Queue:"
+msgstr "Názov tlaèiarne:"
+
+#: src/gutenprintui2/panel.c:1930
+#, fuzzy
+msgid "Enter the correct command to print to your printer. "
+msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+#, fuzzy
+msgid "File to print to"
+msgstr "Test tlaèe"
+
+#: src/gutenprintui2/panel.c:1957
+#, fuzzy
+msgid "Print To File"
+msgstr "Tlaèi» do súboru?"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definovanie novej tlaèiarne"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Názov tlaèiarne:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Vlo¾te oznaèenie, ktoré chcete da» tejto logickej tlaèiarni"
+
+#: src/gutenprintui2/panel.c:2019
+#, fuzzy
+msgid "About Gutenprint "
+msgstr "O Gimp-Print "
+
+#: src/gutenprintui2/panel.c:2026
+#, fuzzy
+msgid "Gutenprint Version "
+msgstr "Verzia Gimp-Print"
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Nastavenie tlaèiarne"
+
+#: 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 ""
+"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
+"tlaèi»"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Nastavenie tlaèiarne..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Voµba model tlaèiarne, PPD súboru a príkaz, ktorý sa pou¾íva pre tlaè na "
+"tejto tlaèiarni"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Nová tlaèiareò..."
+
+#: 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 ""
+"Definovanie novej logickej tlaèiarne. Toto mô¾e by» pou¾ité na pomenovanie "
+"zbierky nastavení, ktoré si prajete zapamäta» a v budúcnosti pou¾íva»."
+
+#: src/gutenprintui2/panel.c:2150
+#, fuzzy
+msgid "Set Printer Option Defaults"
+msgstr "Nastavi» ¹tandardné"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+#, fuzzy
+msgid "Image Size"
+msgstr "Veµkos»"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Zmena:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Nastavi» zväè¹enie (veµkos») obrázku"
+
+#: 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 ""
+"Zvoµte, èi zmena veµkosti bude vyjadrená ako percento dostupnej veµkosti "
+"stránky, alebo ako èíslo výstupného DPI"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Percentá"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Nastavi» ¹írku tlaèe"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Nastavi» vý¹ku tlaèe"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Pou¾i» pôvodnú\n"
+"veµkos» obrázka"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Prispôsobenie farieb pre tlaè"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Nastavi» ¹tandardné"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Zatvori»"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Náhµad obrázku"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+#, fuzzy
+msgid "Output"
+msgstr "Typ výstupu:"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Typ výstupu:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Zvoµte vytú¾ený typ výstupu"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Prispôsobi» výstup..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu"
+
+#: src/gutenprintui2/panel.c:2523
+#, fuzzy
+msgid "Size Units:"
+msgstr "Jednotky:"
+
+#: src/gutenprintui2/panel.c:2526
+#, fuzzy
+msgid " "
+msgstr "> "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Jednotky:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Zvoli» základnú mernú jednotku pre tlaè"
+
+#: 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
+#, fuzzy
+msgid "Printer"
+msgstr "Tlaèi»"
+
+#: src/gutenprintui2/plist.c:1253
+#, fuzzy
+msgid "(Default Printer)"
+msgstr "Nastavi» tlaèiareò"
+
+#: src/cups/genppd.c:144
+#, fuzzy
+msgid "Printer Features"
+msgstr "Nastavenie tlaèiarne"
+
+#: src/cups/genppd.c:145
+#, fuzzy
+msgid "Output Control"
+msgstr "Typ výstupu:"
+
+#: src/cups/genppd.c:150
+#, fuzzy
+msgid "Common"
+msgstr "Príkaz:"
+
+#: src/cups/genppd.c:151
+#, fuzzy
+msgid "Extra 1"
+msgstr "Zásobník 1"
+
+#: src/cups/genppd.c:152
+#, fuzzy
+msgid "Extra 2"
+msgstr "Zásobník 2"
+
+#: src/cups/genppd.c:153
+#, fuzzy
+msgid "Extra 3"
+msgstr "Zásobník 3"
+
+#: src/cups/genppd.c:154
+#, fuzzy
+msgid "Extra 4"
+msgstr "Zásobník 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:952
+msgid "English"
+msgstr "Slovak"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Veµkos» média:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Farebne"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Farebne"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY farba"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Verzia Escputil "
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Toto je iba orientaèný preklad licencie, ktorá platí v originálnom anglickom "
+"znení.\n"
+"\n"
+"Tento program je voµne ¹íriteµný; mô¾ete ho redistribuova» a meni»\n"
+"v súlade so V¹eobecnou verejnou licenciou GNU publikovanou\n"
+"vo Free Software Foundation; buï licenciou verzie 2 alebo\n"
+"(podµa va¹ej voµby) akoukoµvek nov¹ou.\n"
+"\n"
+"Tento program je ¹írený v nádeji, ¾e bude u¾itoèný, av¹ak\n"
+"BEZ AKEJKO¥VEK ZÁRUKY; neposkytujú sa ani odvodené záruky\n"
+"PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL.\n"
+"Ïal¹ie podrobnosti hµadajte vo V¹eobecnej verejnej licencii GNU.\n"
+"\n"
+"S týmto programom by ste mali získa» kópiu V¹eobecnej verejnej\n"
+"licencie GNU; ak tomu tak nie je, napí¹te do Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
+"MA 02111-1307, USA.\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\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 ""
+"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
+"Vykoná údr¾bu tlaèiarní EPSON Stylus (R).\n"
+"Príklad: escputil --clean-head --printer stpex-na-druhom-poschodí\n"
+"         escputil --ink-level --new --raw-device /dev/lp0\n"
+"\n"
+"  Príkazy:\n"
+"    -c|--clean-head    Èistí tlaèovú hlavu.\n"
+"    -n|--nozzle-check  Vytlaèí testovaciu vzorku na otvory.\n"
+"                       ©pinavé alebo upchaté otvory budú zobrazené ako "
+"medzery\n"
+"                       vo vzorke. Ak uvidíte nejaké medzery, mali by ste\n"
+"                       oèisti» tlaèovú hlavu.\n"
+"    -a|--align-head    Zarovnanie tlaèovej hlavy.  UPOZORNENIE: Nesprávne\n"
+"                       pou¾itie tohoto nástroja bude ma» za následok nízku\n"
+"                       kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n"
+"    -o|--align-color   Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 "
+"a\n"
+"                       580 UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja "
+"bude\n"
+"                       ma» za následok nízku kvalitu tlaèe a/alebo "
+"po¹kodenie\n"
+" \t\t\ttlaèiarne.\n"
+"    -s|--status        Informácie o stave tlaèiarne.\n"
+"    -i|--ink-level     Získanie o informácie o úrovni atramentu z "
+"tlaèiarne.\n"
+"\t\t\tToto vy¾aduje prístup èítanie/zápis na základné\n"
+"                       zariadenie tlaèiarne.\n"
+"    -d|--identify      Po¾iadavka na tlaèiareò o informácie o modely.\n"
+"                       Toto vy¾aduje prístup èítanie/zápis na základné\n"
+"                       zariadenie tlaèiarne.\n"
+"    -l|--license       Zobrazenie licencie/podmienok záruky tohoto "
+"programu.\n"
+"    -M|--list-models   Zoznam dostupných modelov tlaèiarní.\n"
+"    -h|--help          Zobrazí tieto informácie.\n"
+"\n"
+"  Voµby:\n"
+"    -P|--printer-name  Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n"
+"                       ©tandardne sa pou¾ije systémová tlaèiareò.\n"
+"    -r|--raw-device    Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n"
+"                       mal pou¾i» tlaèový front.\n"
+"    -u|--new           Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo\n"
+"                       nov¹ia).\n"
+"    -q|--quiet         zakázanie nápisu.\n"
+"    -m|--model         Urèenie presného modelu tlaèiarne pre zarovnanie "
+"hlavy.\n"
+
+#: src/escputil/escputil.c:162
+#, fuzzy
+msgid ""
+"Usage: escputil [OPTIONS] [COMMAND]\n"
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\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 ""
+"Pou¾itie: escputil [VO¥BA] [PRÍKAZ]\n"
+"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
+"Vykoná údr¾bu na tlaèiarni EPSON Stylus (R).\n"
+"Príklady: escputil -c -P stpex-na-druhom-poschodí\n"
+"          escputil -i -u -r /dev/lp0\n"
+"\n"
+"  Príkazy:\n"
+"    -c Èistí tlaèovú hlavu.\n"
+"    -n Vytlaèí testovaciu vzorku na otvory.\n"
+"          ©pinavé alebo upchaté otvory budú zobrazené ako medzery\n"
+"          vo vzorke. Ak uvidíte nejaké medzery, mali by ste oèisti»\n"
+"          tlaèovú hlavu.\n"
+"    -a Zarovnanie tlaèovej hlavy.  UPOZORNENIE: Nesprávne pou¾itie\n"
+"          tohoto nástroja bude ma» za následok nízku kvalitu tlaèe\n"
+"          a/alebo po¹kodenie tlaèiarne.\n"
+"    -o Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 a 580\n"
+"          UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja bude ma»\n"
+"          za následok nízku kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n"
+"    -s Informácie o stave tlaèiarne.\n"
+"    -i Získanie o informácie o úrovni atramentu z tlaèiarne. Toto vy¾aduje\n"
+"          prístup na èítanie/zápis na základné zariadenie tlaèiarne.\n"
+"    -d Po¾iadavka na tlaèiareò o informácie o modely. Toto vy¾aduje prístup\n"
+"          èítanie/zápis na základné zariadenie tlaèiarne.\n"
+"    -l Zobrazenie licencie/podmienok záruky tohoto programu.\n"
+"    -M Zoznam dostupných modelov tlaèiarní.\n"
+"    -h Zobrazí tieto informácie.\n"
+"\n"
+"  Voµby:\n"
+"    -P Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n"
+"          ¹tandardne sa pou¾ije systémová tlaèiareò.\n"
+"    -r Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n"
+"          mal pou¾i» tlaèový front.\n"
+"    -u Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo nov¹ia).\n"
+"    -q zakázanie nápisu.\n"
+"    -m Urèenie presného modelu tlaèiarne pre zarovnanie hlavy.\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Mô¾ete ¹pecifikova» len jednu tlaèiareò alebo prvotné zariadenie."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Neznáme nastavenie %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Nie je mo¾né otvori» zariadenie %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Nie je mo¾né posla» príkaz na tlaèiareò\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Nie je mo¾né èíta» z %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Neznáme nastavenie %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Nie je mo¾né zapisova» do %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Nie je mo¾né zapisova» do %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Nie je mo¾né zisti» typ tlaèiarne.\n"
+"Pou¾ite prosím -m na urèenie modelu va¹ej tlaèiarne.\n"
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotografický papier"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-#, fuzzy
-msgid "Matte Black"
-msgstr "Matný papier"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Jasná azúrová"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 #, fuzzy
 msgid "Light Black"
 msgstr "Èierna"
 
-#: src/main/escp2-channels.c:3182
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
 #, fuzzy
-msgid "Dark Yellow"
-msgstr "®ltá"
+msgid "Matte Black"
+msgstr "Matný papier"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Èierna"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Obyèajný papier rýchle nasadenie"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Veµkos»"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "Sýtos»:"
+
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, fuzzy, c-format
+msgid "Error: Ink out\n"
+msgstr "Chyba na vstupe\n"
+
+#: src/escputil/escputil.c:1075
+#, fuzzy, c-format
+msgid "Error: Paper out\n"
+msgstr "Chyba na vstupe\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Chyba na vstupe\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Farebný atrament"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Zostávajúce percentá"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Názov tlaèiarne:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, fuzzy, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Èistenie hláv...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude "
+"pokraèova».\n"
+"\n"
+"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne\n"
+"Epson Stylus. Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe\n"
+"a mô¾e po¹kodi» samotnú tlaèiareò. Tento nástroj nebol otestovaný\n"
+"spoloènos»ou Seiko Epson a je ponúknutý bez akejkoµvek záruky. Celé\n"
+"riziko za pou¾itie toho nástroja le¾í na vás.\n"
+"\n"
+"Bude vytlaèených %d testovacích vzoriek. V¹etky vzorky sú veµmi podobné.\n"
+"Vzorky obsahujú série zvislých èiar, ktoré sa budú prekrýva» Pod ka¾dým "
+"párom je èíslo\n"
+"od %d do %d.\n"
+"\n"
+"Keï si prezriete páry èiar, mali by ste vybra» taký pár èiar, ktorý je "
+"najlep¹ie\n"
+"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n"
+"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n"
+"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n"
+"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n"
+"do tlaèiarne.\n"
+"\n"
+"Ka¾dá vzorka je podobná, ale posledné vzorky pou¾ívajú jemnej¹ie bodky\n"
+"pre kritickej¹ie zarovnanie. Musíte prejs» v¹etkými fázami zarovnávania,\n"
+"aby va¹a tlaèiareò bola správne zarovnaná.  Po absolvovaní v¹etkých fáz\n"
+"bude zarovnávacia vzorka vytlaèená e¹te raz. Mali by ste zisti», ¾e vzorka\n"
+"v strede (#%d z %d) je najlep¹ia zo v¹etkých,\n"
+"\n"
+"Po vytlaèení ïal¹ej vzorky vám bude ponúknutá mo¾nos» (s) - ulo¾i» výsledky\n"
+"do tlaèiarne, (r) - zopakova» proces, alebo (q) - ukonèi» bez ulo¾enia.\n"
+"Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a následné zapnutie\n"
+"tlaèiarne áno. Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý\n"
+"proces opä», ak budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste "
+"poèas\n"
+"toho procesu nevypli tlaèiareò\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude "
+"pokraèova».\n"
+"\n"
+"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne Epson "
+"Stylus.\n"
+"Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe a mô¾e "
+"po¹kodi»\n"
+"samotnú tlaèiareò. Tento nástroj nebol otestovaný spoloènos»ou Seiko Epson\n"
+"a je ponúknutý bez akejkoµvek záruky. Celé riziko za pou¾itie toho nástroja\n"
+"le¾í na vás.\n"
+"\n"
+"Bude vytlaèená testovacia vzorka, ktorá bude obsahova» sériu párov zvislých\n"
+"èiar, ktoré **overlap. Pod ka¾dým párom èiar je èíslo od %d do %d.\n"
+"\n"
+"Keï si prezriete vzorky, mali by ste vybra» taký pár èiar, ktorý je "
+"najlep¹ie\n"
+"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n"
+"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n"
+"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n"
+"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n"
+"do tlaèiarne.\n"
+"\n"
+"Zarovnávacia vzorka bude vytlaèená e¹te raz. V tomto prípade by najlep¹ím\n"
+"párom (#%d z %d) mal by» ten uprostred. Potom vám bude ponúknutá mo¾nos»\n"
+"(s) - ulo¾i» výsledky do tlaèiarne, (r) - zopakova» proces, alebo (q) - "
+"ukonèi»\n"
+"bez ulo¾enia.  Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a "
+"následné\n"
+"zapnutie tlaèiarne áno.\n"
+"Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý proces opä», ak\n"
+"budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste poèas toho "
+"procesu \n"
+"nevypli tlaèiareò\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Preskúmajte výsledok tlaèe veµmi pozorne a uistite sa,\n"
+"¾e va¹a tlaèiareò má správne zarovnanie. Teraz mô¾ete:\n"
+"  (s) ulo¾i» výsledok do tlaèiarne,\n"
+"  (q) ukonèi» bez ulo¾enia výsledku, alebo\n"
+"  (r) zopakova» celý proces od zaèiatku.\n"
+"Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
+"Èo chcete spravi»? (s,q,r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
+"zarovnávania:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Opakujem proces zarovnávania.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Toto natrvalo zmení nastavenie va¹ej tlaèiarne.\n"
+"VAROVANIE: táto procedúra nebola odsúhlasená spoloènos»ou Seiko Epson\n"
+"a mô¾e po¹kodi» va¹u tlaèiareò. Pokraèova»?\n"
+"Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
+"va¹ej tlaèiarne:\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "O nastaveniach ukladania..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "zlyhalo!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
+"procedúru zarovnávania.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "úspe¹ne!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Neznámy príkaz.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Závereèný príkaz nebol potvrdený.\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 ""
+"Táto procedúra prepokladá, ¾e va¹a tlaèiareò je Epson %s.\n"
+"Ak toto nie je model va¹ej tlaèiarne, stlaète teraz prosím control-C\n"
+"a zvoµte vá¹ súèasný model tlaèiarne.\n"
+"\n"
+"Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n"
+"procedúra zarovnávania hlavy.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Pre pokraèovanie stlaète enter > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Prechod #%d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, 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:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Èíslo je mimo rozsahu!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Pokú¹am sa nastavi» zarovnávanie..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "úspe¹né.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Prekontrolujte prosím, èi je zarovnávanie správne. Potom, èo bude vzorka\n"
+"opä» vytlaèená, uistite sa, èi najlep¹ia vzorka pre ka¾dý riadok je vzorka %"
+"d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie "
+"výsledky pri tlaèi.\n"
+
+#: src/escputil/escputil.c:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Chyba na vstupe\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Tlaèím..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Matný papier"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
 msgid "Postcard"
 msgstr "Pohµadnica"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
-msgstr "Lesklý foto papier Premium"
+msgid "Premium Presentation Paper Matte"
+msgstr "Ligotavý foto papier Premium"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Obyèajný papier"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
+#: src/xml/xmli18n-tmp.h:29
 #, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Matný papier"
-
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr ""
-
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Kotúèový podávaè"
-
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
-msgstr ""
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Lesklý foto papier"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Manual Feed"
-msgstr "Manuál"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
+#: src/xml/xmli18n-tmp.h:37
 #, fuzzy
-msgid "Print to CD"
-msgstr "Tlaèi» do súboru?"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/xml/xmli18n-tmp.h:41
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuál"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Ligotavý foto papier Premium"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuál"
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Zásobník"
+msgid "ColorLife Paper"
+msgstr "Obyèajný papier"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotografický papier"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Obyèajný papier rýchle nasadenie"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Automatický výber"
+msgid "UltraChrome Photo Black"
+msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
-msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI monochromaticky"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
-msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "1440 x 360 DPI Vysoká kvalita"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
 #, fuzzy
-msgid "720 DPI High Quality"
-msgstr "1200 DPI Vysoká kvalita"
+msgid "360 x 120 DPI Economy"
+msgstr "600x600 DPI monochromaticky"
 
-#: src/main/escp2-resolutions.c:103
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
 #, fuzzy
-msgid "720 DPI Highest Quality"
-msgstr "1200 DPI Najvy¹¹ia kvalita"
+msgid "360 x 240 DPI Draft"
+msgstr "600x600 DPI"
 
-#: src/main/escp2-resolutions.c:106
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
 #, fuzzy
-msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgid "720 DPI High Quality"
+msgstr "1200 DPI Vysoká kvalita"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
 #, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgid "720 DPI Highest Quality"
+msgstr "1200 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
 #, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
+msgid "Dark Yellow"
+msgstr "®ltá"
+
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+#, fuzzy
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
-msgid "2880 x 2880 DPI"
+msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
 #, fuzzy
-msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2922
 #, fuzzy
-msgid "Interleave"
-msgstr "Názov tlaèiarne:"
+msgid "Black 1"
+msgstr "Èierna"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Èierna"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Zásobník"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manuál"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+#, fuzzy
+msgid "Print to CD"
+msgstr "Tlaèi» do súboru?"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Kotúèový podávaè"
+
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Názov tlaèiarne:"
+msgid "Manual Sheet Guide"
+msgstr "Manuál"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Jas:"
+msgid "Manual Feed (Front)"
+msgstr "Manuál"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotografický papier"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Automatický výber"
+
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
 #, fuzzy
-msgid "High"
-msgstr "Vý¹ka:"
+msgid "One Color Raw"
+msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
 #, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
+msgid "Three Color Raw"
+msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
 #, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+msgid "Four Color Raw"
+msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
 #, fuzzy
-msgid "Ultra Photo"
+msgid "Five Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+#, fuzzy
+msgid "Six Color Raw"
+msgstr "Fotografický ¹es»farebný"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+#, fuzzy
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+#, fuzzy
+msgid "Three Color Raw Gloss"
+msgstr "Kompozitný trojfarebný"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+#, fuzzy
+msgid "Four Color Raw Gloss"
+msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/generic-options.c:49
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
 #, fuzzy
-msgid "Photograph"
-msgstr "Fotografia"
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Èiarová grafika"
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+#, fuzzy
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/generic-options.c:55
+#: src/xml/xmli18n-tmp.h:3210
 #, fuzzy
-msgid "Page"
-msgstr "Veµkos»"
+msgid "Default Black"
+msgstr "Nastavi» ¹tandardné"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+#, fuzzy
+msgid "Seven Color Photo"
+msgstr "Fotografický ¹es»farebný"
 
-#: src/main/generic-options.c:68
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Kompozitný roz¹írený ¹es»farebný"
+
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
 #, fuzzy
-msgid "Image Type"
-msgstr "Typ obrázku:"
+msgid "Seven Color Raw"
+msgstr "Fotografický ¹es»farebný"
 
-#: src/main/generic-options.c:69
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
 #, fuzzy
-msgid "Type of image being printed"
-msgstr "Typ atramentu tlaèiarne"
+msgid "Two Level Grayscale"
+msgstr "V odtieòoch ¹edej"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+#, fuzzy
+msgid "Two Color Raw"
+msgstr "©tandardný ¹tvorfarebný"
+
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Fotografický ¹es»farebný"
+
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Fotografický ¹es»farebný"
+
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Fotografický ¹es»farebný"
+
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Názov tlaèiarne:"
+
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
 msgstr ""
 
-#: src/main/generic-options.c:80
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
 #, fuzzy
-msgid "Page Number"
-msgstr "Veµkos»"
+msgid "Interleave 2"
+msgstr "Názov tlaèiarne:"
 
-#: src/main/generic-options.c:81
+#: src/xml/xmli18n-tmp.h:3533
 #, fuzzy
-msgid "Page number"
-msgstr "Veµkos»"
+msgid "Eight Pass"
+msgstr "Jas:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Foto papier"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Na ¹írku"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Americké rozmery"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Európske rozmery"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:124
-#, fuzzy
-msgid "ISO A4"
-msgstr "SRA4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr ""
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki karta"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku karta"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlhá obálka #3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonská dlhá obálka #3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlhá obálka #4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonská dlhá obálka #4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská Kaku obálka #4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonská Kaku obálka #4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2 pozvánka"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Obálka"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Obálka"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohµadnica"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Vlastný"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89 mm rolka papiera"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210 mm rolka papiera"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "13 palcová rolka papiera"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "36 palcová rolka papiera"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "4 palcová rolka papiera"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3800
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 msgid "Canon i80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 msgid "Canon i560"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 msgid "Canon i850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 msgid "Canon i860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 msgid "Canon i865"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Stylus C40ux"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Stylus C40sx"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
+msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4284
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4534
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4535
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4536
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4537
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4538
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4539
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4540
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4541
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4551
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4552
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4558
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4561
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4565
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4571
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4572
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4573
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4574
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4575
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4576
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4577
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4578
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4579
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4580
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4581
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4582
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-msgid "Lexmark Optra E220"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+msgid "Lanier MP 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+msgid "Lanier LD1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+msgid "Lanier MP 3350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+msgid "Lanier MP 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
-#, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "Nastavi» tlaèiareò"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+msgid "Lanier MP 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-msgid "Lexmark X73"
+#: src/xml/xmli18n-tmp.h:4834
+msgid "Lanier MP 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1021
-msgid "Olympus P-S100"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-msgid "Canon CP-10"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-msgid "Sony UP-DR100"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-msgid "Fujifilm FinePix-NX-500"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-#, fuzzy
-msgid "Curve type"
-msgstr "Èierna"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "palce"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Nastavi» palce ako základnú mernú jednotku"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Nastavi» centimetre ako základnú mernú jednotku"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Points"
-msgstr "Tlaèi»"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-#, fuzzy
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Nastavi» palce ako základnú mernú jednotku"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-#, fuzzy
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Nastavi» centimetre ako základnú mernú jednotku"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-#, fuzzy
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Nastavi» palce ako základnú mernú jednotku"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Farebný výstup"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Tlaèi» v odtieòoch ¹edej s pou¾itím èiernej farby"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-#, fuzzy
-msgid "Standard Command"
-msgstr "©tandardný"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-#, fuzzy
-msgid "Custom Command"
-msgstr "Príkaz:"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Súbor"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-#, fuzzy
-msgid "Print to a file"
-msgstr "Tlaèi» do súboru?"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-#, fuzzy
-msgid "Set Default"
-msgstr "Nastavi» ¹tandardné"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Storno"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Nastavenie tlaèiarne..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Tlaè v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "O programe"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Ulo¾i» nastavenia\n"
-"a vytlaèi»"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"Ulo¾i»\n"
-"nastavenia"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Tlaèi»"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Náhµad"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"Pozícia obrázku na strane.\n"
-"Kliknite a potiahnite primárne tlaèítko na pozíciu obrázku.\n"
-"Kliknite a potiahnite sekundárne tlaèítko pohybu obrázku s jemnej¹ou "
-"presnos»ou; ka¾dá jednotka pohybu posunie obrázok o jeden bod (1/72\")\n"
-"Kliknite a potiahnite so stredným tlaèítkom na pohyb v jednotkách veµkosti "
-"obrázku.\n"
-"Ak pri klikaní a »ahaní podr¾íte klávesu Shift obmedzíte pohyb obrázku iba "
-"na vodorovný a zvislý pohyb.\n"
-"Ak poèas »ahania obrázku my¹ou kliknete iným tlaèítkom, obrázok sa vráti na "
-"pôvodnú pozíciu."
 
-#: src/gutenprintui2/panel.c:1495
-#, fuzzy
-msgid "Paper Size"
-msgstr "Veµkos»"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Rozmery:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "©írka:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "©írka papiera, na ktorý chcete tlaèi»"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Vý¹ka:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-#, fuzzy
-msgid "Automatic Paper Size"
-msgstr "Veµkos»"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4943
 #, fuzzy
-msgid "Image Position"
-msgstr "Pozícia"
+msgid "Oki Super 6e"
+msgstr "Stylus Photo"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automaticky"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Na vý¹ku"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Na ¹írku"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Hore nohami"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Na ¹írku"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
 msgstr ""
-"Zvoµte orientáciu: na vý¹ku, na ¹írku, hore nohami, na ¹írku hore nohami "
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientácia:"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "¥avý:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Vzdialenos» od µavého okraja papiera k obrázku"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Pravý:"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Vzdialenos» od µavého okraja papiera k pravému okraju obrázku"
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Vzdialenos» od pravého okraja papiera k obrázku"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Horný:"
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Vzdialenos» od horného okraja papiera k obrázku"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Dolný:"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-#, fuzzy
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Vzdialenos» od horného okraja papiera k dolnému okraju obrázku"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Vzdialenos» od dolného okraja papiera k obrázku"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centrovanie:"
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-#, fuzzy
-msgid "Horizontal"
-msgstr "Vodorovne"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Vycentrova» vodorovne obrázok na papieri"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "Oboje"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Vycentrova» obrázok na papieri"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-#, fuzzy
-msgid "Vertical"
-msgstr "Zvislo"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Vycentrova» obrázok zvisle na papieri"
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Nastavi» tlaèiareò"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-#, fuzzy
-msgid "Printer Make:"
-msgstr "Názov tlaèiarne:"
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-#, fuzzy
-msgid "Select the make of your printer"
-msgstr "Vyberte model va¹ej tlaèiarne"
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Model tlaèiarne:"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Vyberte model va¹ej tlaèiarne"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD súbor:"
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Prechádza»"
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Zvoµte správny PPD názov súboru pre va¹u tlaèiareò"
+#: src/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-#, fuzzy
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
-"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
-"tlaèi»"
 
-#: src/gutenprintui2/panel.c:1887
-#, fuzzy
-msgid "Printer Queue:"
-msgstr "Názov tlaèiarne:"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-#, fuzzy
-msgid "Enter the correct command to print to your printer. "
-msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-#, fuzzy
-msgid "File to print to"
-msgstr "Test tlaèe"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-#, fuzzy
-msgid "Print To File"
-msgstr "Tlaèi» do súboru?"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Definovanie novej tlaèiarne"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Názov tlaèiarne:"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Vlo¾te oznaèenie, ktoré chcete da» tejto logickej tlaèiarni"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-#, fuzzy
-msgid "About Gutenprint "
-msgstr "O Gimp-Print "
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-#, fuzzy
-msgid "Gutenprint Version "
-msgstr "Verzia Gimp-Print"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Nastavenie tlaèiarne"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
 msgstr ""
-"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
-"tlaèi»"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Nastavenie tlaèiarne..."
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
 msgstr ""
-"Voµba model tlaèiarne, PPD súboru a príkaz, ktorý sa pou¾íva pre tlaè na "
-"tejto tlaèiarni"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Nová tlaèiareò..."
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-msgid ""
-"Define a new logical printer. This can be used to name a collection of "
-"settings that you wish to remember for future use."
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
-"Definovanie novej logickej tlaèiarne. Toto mô¾e by» pou¾ité na pomenovanie "
-"zbierky nastavení, ktoré si prajete zapamäta» a v budúcnosti pou¾íva»."
 
-#: src/gutenprintui2/panel.c:2123
-#, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Nastavi» ¹tandardné"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-#, fuzzy
-msgid "Image Size"
-msgstr "Veµkos»"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Zmena:"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Nastavi» zväè¹enie (veµkos») obrázku"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
 msgstr ""
-"Zvoµte, èi zmena veµkosti bude vyjadrená ako percento dostupnej veµkosti "
-"stránky, alebo ako èíslo výstupného DPI"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Percentá"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec"
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Nastavi» ¹írku tlaèe"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Nastavi» vý¹ku tlaèe"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
 msgstr ""
-"Pou¾i» pôvodnú\n"
-"veµkos» obrázka"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Prispôsobenie farieb pre tlaè"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Nastavi» ¹tandardné"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Zatvori»"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Náhµad obrázku"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-#, fuzzy
-msgid "Output"
-msgstr "Typ výstupu:"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Typ výstupu:"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Zvoµte vytú¾ený typ výstupu"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Prispôsobi» výstup..."
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
-"Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu"
 
-#: src/gutenprintui2/panel.c:2496
-#, fuzzy
-msgid "Size Units:"
-msgstr "Jednotky:"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-#, fuzzy
-msgid " "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Jednotky:"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Zvoli» základnú mernú jednotku pre tlaè"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-#, fuzzy
-msgid "Printer"
-msgstr "Tlaèi»"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-#, fuzzy
-msgid "(Default Printer)"
-msgstr "Nastavi» tlaèiareò"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:145
-#, fuzzy
-msgid "Printer Features"
-msgstr "Nastavenie tlaèiarne"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:146
-#, fuzzy
-msgid "Output Control"
-msgstr "Typ výstupu:"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
+msgstr ""
 
-#: src/cups/genppd.c:151
-#, fuzzy
-msgid "Common"
-msgstr "Príkaz:"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/cups/genppd.c:152
-#, fuzzy
-msgid "Extra 1"
-msgstr "Zásobník 1"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
-msgid "Extra 2"
-msgstr "Zásobník 2"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
+msgstr ""
 
-#: src/cups/genppd.c:154
-#, fuzzy
-msgid "Extra 3"
-msgstr "Zásobník 3"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
+msgstr ""
 
-#: src/cups/genppd.c:155
-#, fuzzy
-msgid "Extra 4"
-msgstr "Zásobník 4"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
+msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 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:1064
-msgid "English"
-msgstr "Slovak"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1647
-msgid "2-Sided Printing"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
 msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5043
+msgid "Savin 2560"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-msgid "Value"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Verzia Escputil "
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Toto je iba orientaèný preklad licencie, ktorá platí v originálnom anglickom "
-"znení.\n"
-"\n"
-"Tento program je voµne ¹íriteµný; mô¾ete ho redistribuova» a meni»\n"
-"v súlade so V¹eobecnou verejnou licenciou GNU publikovanou\n"
-"vo Free Software Foundation; buï licenciou verzie 2 alebo\n"
-"(podµa va¹ej voµby) akoukoµvek nov¹ou.\n"
-"\n"
-"Tento program je ¹írený v nádeji, ¾e bude u¾itoèný, av¹ak\n"
-"BEZ AKEJKO¥VEK ZÁRUKY; neposkytujú sa ani odvodené záruky\n"
-"PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL.\n"
-"Ïal¹ie podrobnosti hµadajte vo V¹eobecnej verejnej licencii GNU.\n"
-"\n"
-"S týmto programom by ste mali získa» kópiu V¹eobecnej verejnej\n"
-"licencie GNU; ak tomu tak nie je, napí¹te do Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
-"MA 02111-1307, USA.\n"
 
-#: src/escputil/escputil.c:119
-#, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
 msgstr ""
-"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
-"Vykoná údr¾bu tlaèiarní EPSON Stylus (R).\n"
-"Príklad: escputil --clean-head --printer stpex-na-druhom-poschodí\n"
-"         escputil --ink-level --new --raw-device /dev/lp0\n"
-"\n"
-"  Príkazy:\n"
-"    -c|--clean-head    Èistí tlaèovú hlavu.\n"
-"    -n|--nozzle-check  Vytlaèí testovaciu vzorku na otvory.\n"
-"                       ©pinavé alebo upchaté otvory budú zobrazené ako "
-"medzery\n"
-"                       vo vzorke. Ak uvidíte nejaké medzery, mali by ste\n"
-"                       oèisti» tlaèovú hlavu.\n"
-"    -a|--align-head    Zarovnanie tlaèovej hlavy.  UPOZORNENIE: Nesprávne\n"
-"                       pou¾itie tohoto nástroja bude ma» za následok nízku\n"
-"                       kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n"
-"    -o|--align-color   Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 "
-"a\n"
-"                       580 UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja "
-"bude\n"
-"                       ma» za následok nízku kvalitu tlaèe a/alebo "
-"po¹kodenie\n"
-" \t\t\ttlaèiarne.\n"
-"    -s|--status        Informácie o stave tlaèiarne.\n"
-"    -i|--ink-level     Získanie o informácie o úrovni atramentu z "
-"tlaèiarne.\n"
-"\t\t\tToto vy¾aduje prístup èítanie/zápis na základné\n"
-"                       zariadenie tlaèiarne.\n"
-"    -d|--identify      Po¾iadavka na tlaèiareò o informácie o modely.\n"
-"                       Toto vy¾aduje prístup èítanie/zápis na základné\n"
-"                       zariadenie tlaèiarne.\n"
-"    -l|--license       Zobrazenie licencie/podmienok záruky tohoto "
-"programu.\n"
-"    -M|--list-models   Zoznam dostupných modelov tlaèiarní.\n"
-"    -h|--help          Zobrazí tieto informácie.\n"
-"\n"
-"  Voµby:\n"
-"    -P|--printer-name  Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n"
-"                       ©tandardne sa pou¾ije systémová tlaèiareò.\n"
-"    -r|--raw-device    Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n"
-"                       mal pou¾i» tlaèový front.\n"
-"    -u|--new           Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo\n"
-"                       nov¹ia).\n"
-"    -q|--quiet         zakázanie nápisu.\n"
-"    -m|--model         Urèenie presného modelu tlaèiarne pre zarovnanie "
-"hlavy.\n"
 
-#: src/escputil/escputil.c:162
-#, fuzzy
-msgid ""
-"Usage: escputil [OPTIONS] [COMMAND]\n"
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MyQueue\n"
-"\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"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
 msgstr ""
-"Pou¾itie: escputil [VO¥BA] [PRÍKAZ]\n"
-"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
-"Vykoná údr¾bu na tlaèiarni EPSON Stylus (R).\n"
-"Príklady: escputil -c -P stpex-na-druhom-poschodí\n"
-"          escputil -i -u -r /dev/lp0\n"
-"\n"
-"  Príkazy:\n"
-"    -c Èistí tlaèovú hlavu.\n"
-"    -n Vytlaèí testovaciu vzorku na otvory.\n"
-"          ©pinavé alebo upchaté otvory budú zobrazené ako medzery\n"
-"          vo vzorke. Ak uvidíte nejaké medzery, mali by ste oèisti»\n"
-"          tlaèovú hlavu.\n"
-"    -a Zarovnanie tlaèovej hlavy.  UPOZORNENIE: Nesprávne pou¾itie\n"
-"          tohoto nástroja bude ma» za následok nízku kvalitu tlaèe\n"
-"          a/alebo po¹kodenie tlaèiarne.\n"
-"    -o Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 a 580\n"
-"          UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja bude ma»\n"
-"          za následok nízku kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n"
-"    -s Informácie o stave tlaèiarne.\n"
-"    -i Získanie o informácie o úrovni atramentu z tlaèiarne. Toto vy¾aduje\n"
-"          prístup na èítanie/zápis na základné zariadenie tlaèiarne.\n"
-"    -d Po¾iadavka na tlaèiareò o informácie o modely. Toto vy¾aduje prístup\n"
-"          èítanie/zápis na základné zariadenie tlaèiarne.\n"
-"    -l Zobrazenie licencie/podmienok záruky tohoto programu.\n"
-"    -M Zoznam dostupných modelov tlaèiarní.\n"
-"    -h Zobrazí tieto informácie.\n"
-"\n"
-"  Voµby:\n"
-"    -P Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n"
-"          ¹tandardne sa pou¾ije systémová tlaèiareò.\n"
-"    -r Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n"
-"          mal pou¾i» tlaèový front.\n"
-"    -u Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo nov¹ia).\n"
-"    -q zakázanie nápisu.\n"
-"    -m Urèenie presného modelu tlaèiarne pre zarovnanie hlavy.\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Mô¾ete ¹pecifikova» len jednu tlaèiareò alebo prvotné zariadenie."
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Neznáme nastavenie %c\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5061
+msgid "Savin 4060"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Nie je mo¾né otvori» zariadenie %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+msgid "Savin 4090"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Nie je mo¾né posla» príkaz na tlaèiareò\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5066
+msgid "Savin 8020"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Nie je mo¾né èíta» z %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Neznáme nastavenie %s\n"
+#: src/xml/xmli18n-tmp.h:5070
+msgid "Savin 8030"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Nie je mo¾né zapisova» do %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
-"\n"
-"Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
-"\n"
-"Nie je mo¾né zisti» typ tlaèiarne.\n"
-"Pou¾ite prosím -m na urèenie modelu va¹ej tlaèiarne.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "Sýtos»:"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5079
+msgid "Savin 8065"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5081
+msgid "Savin 8090"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, fuzzy, c-format
-msgid "Error: Ink out\n"
-msgstr "Chyba na vstupe\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, fuzzy, c-format
-msgid "Error: Paper out\n"
-msgstr "Chyba na vstupe\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "Nastavi» tlaèiareò"
+
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Farebný atrament"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Zostávajúce percentá"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, fuzzy, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, fuzzy, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
+#: src/xml/xmli18n-tmp.h:5113
+msgid "Lexmark X73"
 msgstr ""
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, fuzzy, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr ""
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Èistenie hláv...\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
 msgstr ""
-"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude "
-"pokraèova».\n"
-"\n"
-"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne\n"
-"Epson Stylus. Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe\n"
-"a mô¾e po¹kodi» samotnú tlaèiareò. Tento nástroj nebol otestovaný\n"
-"spoloènos»ou Seiko Epson a je ponúknutý bez akejkoµvek záruky. Celé\n"
-"riziko za pou¾itie toho nástroja le¾í na vás.\n"
-"\n"
-"Bude vytlaèených %d testovacích vzoriek. V¹etky vzorky sú veµmi podobné.\n"
-"Vzorky obsahujú série zvislých èiar, ktoré sa budú prekrýva» Pod ka¾dým "
-"párom je èíslo\n"
-"od %d do %d.\n"
-"\n"
-"Keï si prezriete páry èiar, mali by ste vybra» taký pár èiar, ktorý je "
-"najlep¹ie\n"
-"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n"
-"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n"
-"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n"
-"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n"
-"do tlaèiarne.\n"
-"\n"
-"Ka¾dá vzorka je podobná, ale posledné vzorky pou¾ívajú jemnej¹ie bodky\n"
-"pre kritickej¹ie zarovnanie. Musíte prejs» v¹etkými fázami zarovnávania,\n"
-"aby va¹a tlaèiareò bola správne zarovnaná.  Po absolvovaní v¹etkých fáz\n"
-"bude zarovnávacia vzorka vytlaèená e¹te raz. Mali by ste zisti», ¾e vzorka\n"
-"v strede (#%d z %d) je najlep¹ia zo v¹etkých,\n"
-"\n"
-"Po vytlaèení ïal¹ej vzorky vám bude ponúknutá mo¾nos» (s) - ulo¾i» výsledky\n"
-"do tlaèiarne, (r) - zopakova» proces, alebo (q) - ukonèi» bez ulo¾enia.\n"
-"Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a následné zapnutie\n"
-"tlaèiarne áno. Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý\n"
-"proces opä», ak budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste "
-"poèas\n"
-"toho procesu nevypli tlaèiareò\n"
-"\n"
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
 msgstr ""
-"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude "
-"pokraèova».\n"
-"\n"
-"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne Epson "
-"Stylus.\n"
-"Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe a mô¾e "
-"po¹kodi»\n"
-"samotnú tlaèiareò. Tento nástroj nebol otestovaný spoloènos»ou Seiko Epson\n"
-"a je ponúknutý bez akejkoµvek záruky. Celé riziko za pou¾itie toho nástroja\n"
-"le¾í na vás.\n"
-"\n"
-"Bude vytlaèená testovacia vzorka, ktorá bude obsahova» sériu párov zvislých\n"
-"èiar, ktoré **overlap. Pod ka¾dým párom èiar je èíslo od %d do %d.\n"
-"\n"
-"Keï si prezriete vzorky, mali by ste vybra» taký pár èiar, ktorý je "
-"najlep¹ie\n"
-"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n"
-"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n"
-"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n"
-"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n"
-"do tlaèiarne.\n"
-"\n"
-"Zarovnávacia vzorka bude vytlaèená e¹te raz. V tomto prípade by najlep¹ím\n"
-"párom (#%d z %d) mal by» ten uprostred. Potom vám bude ponúknutá mo¾nos»\n"
-"(s) - ulo¾i» výsledky do tlaèiarne, (r) - zopakova» proces, alebo (q) - "
-"ukonèi»\n"
-"bez ulo¾enia.  Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a "
-"následné\n"
-"zapnutie tlaèiarne áno.\n"
-"Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý proces opä», ak\n"
-"budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste poèas toho "
-"procesu \n"
-"nevypli tlaèiareò\n"
-"\n"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n"
+#: src/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
 msgstr ""
-"Preskúmajte výsledok tlaèe veµmi pozorne a uistite sa,\n"
-"¾e va¹a tlaèiareò má správne zarovnanie. Teraz mô¾ete:\n"
-"  (s) ulo¾i» výsledok do tlaèiarne,\n"
-"  (q) ukonèi» bez ulo¾enia výsledku, alebo\n"
-"  (r) zopakova» celý proces od zaèiatku.\n"
-"Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
-"Èo chcete spravi»? (s,q,r)?\n"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr ""
 
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
 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:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
 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:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
 msgstr ""
-"Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
-"zarovnávania:\n"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Opakujem proces zarovnávania.\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5128
+msgid "Olympus P-S100"
 msgstr ""
-"Toto natrvalo zmení nastavenie va¹ej tlaèiarne.\n"
-"VAROVANIE: táto procedúra nebola odsúhlasená spoloènos»ou Seiko Epson\n"
-"a mô¾e po¹kodi» va¹u tlaèiareò. Pokraèova»?\n"
-"Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
-"va¹ej tlaèiarne:\n"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "O nastaveniach ukladania..."
+#: src/xml/xmli18n-tmp.h:5129
+msgid "Canon CP-10"
+msgstr ""
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "zlyhalo!\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr ""
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
 msgstr ""
-"Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
-"procedúru zarovnávania.\n"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "úspe¹ne!\n"
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr ""
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Neznámy príkaz.\n"
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Závereèný príkaz nebol potvrdený.\n"
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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"
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
 msgstr ""
-"Táto procedúra prepokladá, ¾e va¹a tlaèiareò je Epson %s.\n"
-"Ak toto nie je model va¹ej tlaèiarne, stlaète teraz prosím control-C\n"
-"a zvoµte vá¹ súèasný model tlaèiarne.\n"
-"\n"
-"Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n"
-"procedúra zarovnávania hlavy.\n"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Pre pokraèovanie stlaète enter > "
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr ""
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
 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:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Prechod #%d"
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr ""
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Vlo¾te prosím nový hárok papiera.\n"
+#: src/xml/xmli18n-tmp.h:5140
+msgid "Canon SELPHY-CP-720"
+msgstr ""
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Èíslo je mimo rozsahu!\n"
+#: src/xml/xmli18n-tmp.h:5141
+msgid "Canon SELPHY-CP-730"
+msgstr ""
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
+#: src/xml/xmli18n-tmp.h:5142
+msgid "Canon SELPHY-CP-740"
+msgstr ""
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n"
+#: src/xml/xmli18n-tmp.h:5143
+msgid "Canon SELPHY-CP-750"
+msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Pokú¹am sa nastavi» zarovnávanie..."
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
+msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "úspe¹né.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5146
+msgid "Canon SELPHY ES20"
 msgstr ""
-"Prekontrolujte prosím, èi je zarovnávanie správne. Potom, èo bude vzorka\n"
-"opä» vytlaèená, uistite sa, èi najlep¹ia vzorka pre ka¾dý riadok je vzorka %"
-"d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie "
-"výsledky pri tlaèi.\n"
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Chyba na vstupe\n"
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
+msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Tlaèím..."
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5150
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5154
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr ""
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
+
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "V odtieòoch ¹edej"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Roz¹írený sedemfarebný"
+
+#, 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"
@@ -8764,18 +12782,12 @@ msgstr "Tlaèím..."
 #~ msgid "High Gloss Film"
 #~ msgstr "Vysokolesklý film"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Lesklý foto papier"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Lesklé foto karty"
 
 #~ msgid "Photo Paper Pro"
 #~ msgstr "Foto papier pro"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY farba"
-
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK farba"
 
@@ -9395,9 +13407,6 @@ msgstr "Tlaèím..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Typ média na ktorý bude tlaèené"
 
-#~ msgid "Media Size:"
-#~ msgstr "Veµkos» média:"
-
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
 
diff --git a/po/stamp-po b/po/stamp-po
new file mode 100644
index 0000000..9788f70
--- /dev/null
+++ b/po/stamp-po
@@ -0,0 +1 @@
+timestamp
diff --git a/po/sv.gmo b/po/sv.gmo
index 8c0fd71..0eb7419 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index c509fa6..cf13baf 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.92 2008/04/26 17:30:35 rlk Exp $
+# $Id: sv.po,v 1.97 2008/10/19 19:39:43 rlk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2006-05-23 23:04+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -20,7 +20,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Standard"
 
@@ -92,18 +92,19 @@ msgstr ""
 msgid "Density"
 msgstr "Densitet"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -162,9 +163,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Pappersstorlek"
 
@@ -172,315 +173,361 @@ msgstr "Pappersstorlek"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "Grundläggande skrivarinställningar"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Storlek på pappret som du vill skriva ut till"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "Mediatyp"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Typ av media (vanligt papper, fotopapper, etc.)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "Mediakälla"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Källa (inmatningsfack) med media som du skriver ut till"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Skala utskriften till storleken på sidan"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Avancerad skrivarkonfiguration"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "Upplösning"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "Upplösning och kvalitet på utskriften"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Bläcktyp"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ av bläck i skrivaren"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr "Bläckkanaler"
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Avancerad skrivarfunktionalitet"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Utskriftsläge"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kärnparameter"
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Utskriftskvalitet"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Avancerad bläckjustering"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Ljus magenta"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr "Av"
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "LÃ¥ng kant (Standard)"
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "CD - 5 tum"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "CD - 3 tum"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Anpassat"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Svart och vitt"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Utdatatyp:"
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Hög träffsäkerhet"
@@ -514,9 +561,8 @@ msgstr "RÃ¥"
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -532,11 +578,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -600,7 +646,7 @@ msgid "Output image type"
 msgstr "Utdatatyp:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr "RÃ¥kanaler"
 
@@ -665,16 +711,56 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -682,16 +768,56 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justera cyangamma"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -699,16 +825,56 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justera magentagamma"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "Gul"
 
@@ -716,9 +882,11 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justera gulgamma"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "Röd"
 
@@ -726,7 +894,7 @@ msgstr "Röd"
 msgid "Adjust the red gamma"
 msgstr "Justera rödgamma"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "Grön"
 
@@ -734,9 +902,10 @@ msgstr "Grön"
 msgid "Adjust the green gamma"
 msgstr "Justera gröngamma"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "Blå"
 
@@ -745,16 +914,54 @@ msgid "Adjust the blue gamma"
 msgstr "Justera blågamma"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "Svart"
 
@@ -762,7 +969,7 @@ msgstr "Svart"
 msgid "Adjust the black gamma"
 msgstr "Justera svartgamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "Cyanbalans"
 
@@ -775,7 +982,7 @@ msgstr "Gråbalans"
 msgid "Adjust the cyan gray balance"
 msgstr "Justera cyan-gråbalansen"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "Magentabalans"
 
@@ -783,7 +990,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:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "Gulbalans"
 
@@ -811,10 +1018,11 @@ msgstr "Bläckgräns"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utdatatyp:"
@@ -823,27 +1031,27 @@ msgstr "Utdatatyp:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -973,79 +1181,79 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Värde måste ställas in för %s\n"
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "\"%s\" är inte en giltig %s\n"
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s måste vara mellan %f och %f (är %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s måste vara mellan %d och %d (är %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Okänd typparameter %s (%d)\n"
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s är utanför intervallet (värde %d, min %d, max %d)\n"
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "Pappersstorleken är inte giltig\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Övre marginalen får inte vara negativ\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Vänstermarginalen får inte vara negativ\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Vänstermarginalen får inte vara negativ\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Övre marginalen får inte vara negativ\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1054,7 +1262,7 @@ msgstr ""
 "Bilden är för bred för sidan: vänstermarginalen är %d, bredd %d, högerkanten "
 "är %d\n"
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1063,400 +1271,468 @@ msgstr ""
 "Bilden är för lång för sidan: övre marginal är %d, höjd %d, nedre kanten är %"
 "d\n"
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr "Automatiskt utskriftsläge"
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "Automatiskt utskriftsläge"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "Utskriftskvalitet"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "Upplösning på utskriften"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr "Förbättrat glansig"
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr "Lägg till glansförbättring"
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 #, fuzzy
 msgid "Ink Set"
 msgstr "Bläcktyp"
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 #, fuzzy
 msgid "Output Order"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr "Justeringsval"
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 #, fuzzy
 msgid "Ink change command"
 msgstr "Okänt kommando.\n"
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr "Alternativa justeringsval"
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr "Kanalnamn"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr "Cyankarta"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr "Justera cyankartan"
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr "Magentakarta"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr "Justera magentakartan"
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr "Gulkarta"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr "Justera gulkartan"
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr "Blåkarta"
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr "Justera blåkartan"
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+#, fuzzy
+msgid "Orange Map"
+msgstr "Cyankarta"
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Justera rödkartan"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr "Rödkarta"
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr "Justera rödkartan"
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 #, fuzzy
 msgid "Red Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 #, fuzzy
 msgid "Blue Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "Intensitet:"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Justera gulbalansen på utskriften"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr "Glansnivå"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr "Justera glansnivån"
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Ljus magenta"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Mörk gul"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:1999
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
 #, fuzzy
-msgid "Full Manual Control"
-msgstr "Utdatatyp:"
+msgid "Paper Thickness"
+msgstr "Pappersstorlek"
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:800
+#, fuzzy
+msgid "Set printer paper thickness"
+msgstr "Ställ in standardvärden"
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Intensitet:"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
 #, fuzzy
-msgid "Manual Control"
+msgid "Print Method"
+msgstr "Utskriftsläge"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Vanligt papper"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+#, fuzzy
+msgid "Feed Adjustment"
+msgstr "Finjustering"
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+#, fuzzy
+msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "Standard"
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr "Dubbelriktad"
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr "Enkelriktad"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr "Undvik närmaste granne"
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+#, fuzzy
+msgid "Short Edge(Flip)"
+msgstr "Kort kant (Vänd)"
+
+#: src/main/print-escp2.c:2821
 #, 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:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n"
 
@@ -1510,132 +1786,359 @@ msgstr "testutskrift"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr "Sexfärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "Vanligt papper"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "Glansig film"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "Genomskinligheter"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "Kuvert"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr "Tungt Ilford-papper"
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "Annat"
 
@@ -1651,170 +2154,193 @@ msgstr "Manuell med paus"
 msgid "Manual without Pause"
 msgstr "Manuell utan paus"
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr "Inget"
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr "Glansig"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr "Textur"
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr "Laminatmönster"
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "Justera cyanbalansen"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "Justera magentabalansen"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "Justera gulbalansen"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "Svartbalans"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "Justera svartbalansen"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr "Vanlig"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr "Band"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "Glansigt foto"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "Genomskinligt"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr "Snabbtorkande foto"
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr "Snabbtorkande genomskinligt"
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr "Fack 1"
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr "Fack 2"
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr "Fack 3"
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr "Fack 4"
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr "Portabel arkmatare"
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr "Skrivbordsarkmatare"
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr "Fack"
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr "Valfri källa"
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI enfärgad"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr "Utdrag"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr "Hög"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr "Färgpatroner + svarta patroner"
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr "Färgpatroner + fotopatroner"
 
@@ -1822,6519 +2348,10214 @@ msgstr "Färgpatroner + fotopatroner"
 msgid "PPDFile"
 msgstr "PPD-fil"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "PPD-fil"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
 msgstr "Kanalnamn"
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "Anpassat"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
-msgstr "Tvånivås gråton"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr "Snabb ekonomi"
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
-msgid "Three Level Grayscale"
-msgstr "Trenivåers gråton"
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr "Ekonomi"
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
-msgstr "Quadtone"
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1466
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
 #, fuzzy
-msgid "Four Color Photo"
+msgid "Ultra Photo"
 msgstr "Sexfärgs foto"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
-msgstr "Sexfärgs förbättrad sammansatt"
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr "Bästa"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
-msgstr "Sjufärgs foto"
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Text"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
-msgstr "Sjufärgs förbättrad"
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Grafik"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
-msgstr "Åttafärgers foto"
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Blandat text och grafik"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
-msgstr "Enfärgers rå"
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Fotografi"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
-msgstr "Enfärgers rå förbättrad glansig"
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Linjegrafik"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
-msgstr "Tvåfärgers rå"
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Sida"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
-msgstr "Trefärgers rå"
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Jobb"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
-msgstr "Trefärgers rå glansig"
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Bildtyp"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
-msgstr "Fyrfärgers rå"
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Typ av bild som ska skrivas ut"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
-msgstr "Fyrfärgers rå glansig"
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr "Jobbläge"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
-msgstr "Femfärgers rå"
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Jobb mot sidläge"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
-msgstr "Sexfärgers rå"
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Sidnummer"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
-msgstr "Sexfärgers förbättrad glansig rå"
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Sidnummer"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
-msgstr "Sjufärgers rå"
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Kurvtyp"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sjufärgers förbättrad glansig rå"
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
-msgstr "Åttafärgers rå"
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "Minimalt X"
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Minimalt möjligt värde för X"
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Maximalt X"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Maximalt möjligt X-värde"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Minimalt Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Minimalt möjligt värde för Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Maximalt Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Maximalt möjligt värde för Y"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gammavärde"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Tum"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Ställ in grundenheten till tum"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Ställ in grundenheten till centimeter"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Punkter"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Ställ in grundenheten för mått till punkter (1/72\")"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr "mm"
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Ställ in grundenheten för mått till millimeter"
+
+#: 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 "Ställ in grundenheten för mått till pica (1/12\")"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Färgutdata"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Skriv ut i gråtoner genom att använda svart bläck"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Standard kommando"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Använd standardkommando för utskrift"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Anpassat kommando"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Använd anpassat kommando för utskrift"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Fil"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Skriv ut till en fil"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Redigera kurva..."
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Ställ in standard"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Återställ föregående"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+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 "Avbryt"
+
+#: src/gutenprintui2/panel.c:642
+#, fuzzy
+msgid "Select File..."
+msgstr "Konfigurera skrivare..."
+
+#: src/gutenprintui2/panel.c:1028
+#, fuzzy
+msgid "Reset"
+msgstr "Bästa"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Utskrift v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Om"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
 msgstr ""
+"Skriv ut och\n"
+"spara inställningar"
 
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Spara\n"
+"inställningar"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Skriv ut"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Förhandsgranskning"
+
+#: 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 ""
+"Positionera bilden på sidan.\n"
+"Klicka och dra med huvudknappen för att positionera bilden.\n"
+"Klicka och dra med den andra knappen för att flytta bilden med finare "
+"precision; varje flyttenhet flyttar bilden med en punkt (1/72\")\n"
+"Klicka och dra med den tredje (mittersta) musknappen för att flytta bilden i "
+"enheter av bildstorleken.\n"
+"Att hålla ned skifttangenten vid klickande och dragande begränsar flytten "
+"till rörelse i endast horisontell och vertikal led.\n"
+"Om du klickar någon annan knapp under tiden du drar med musen kommer bilden "
+"att återgå till sin ursprungliga position."
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Pappersstorlek"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Visa alla pappersstorlekar"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Dimensioner:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Bredd:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Bredd på pappret som du vill skriva ut till"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Höjd:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Höjd på pappret som du vill skriva ut till"
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Automatisk pappersstorlek"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Antal kopior"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Välj antalet kopior att skriva ut; ett värde mellan 1 och 100"
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Bildposition"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automatisk"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Stående"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Liggande"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Uppochner"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Liggande uppochner"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Välj orientering: stående, liggande, uppochner eller liggande uppochner"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientering:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Vänster:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Avstånd från vänsterkanten på pappret till bilden"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Höger:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Avstånd från högerkanten på pappret till bilden"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Övre kant:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Avstånd från överkanten på pappret till bilden"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Nedre kant:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr "Avstånd från överkanten på pappret till nederkanten på bilden"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Avstånd från nederkanten på pappret till bilden"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centrera:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Horisontal"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centrera bilden horisontellt på pappret"
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "BÃ¥de och"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centrera bilden på pappret"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Vertikal"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centrera bilden vertikalt på pappret"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Konfigurera skrivare"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Skrivarmärke:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Välj märke på din skrivare"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Skrivarmodell:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Välj modell på din skrivare"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "PPD-fil:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Ange rätt PPD-filnamn för din skrivare"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Bläddra"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Välj rätt PPD-filnamn för din skrivare"
+
+#: 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 ""
+"Välj namnet på utskriftskön (inte skrivarens typ eller modell) som du vill "
+"skriva ut på"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Skrivarkö:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Ange korrekt kommando för att skriva ut på din skrivare. "
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Ange filen att skriva till. "
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "Fil att skriva ut till"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Skriv ut till fil"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Ange ny skrivare"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Skrivarnamn:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Ange det namn som du vill ge denna logiska skrivare"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "Om Gutenprint "
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Gutenprint version "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Skrivarinställningar"
+
+#: 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 ""
+"Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
+"skriva ut till"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Konfigurera skrivare..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut "
+"till denna skrivare"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Ny skrivare..."
+
+#: 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 ""
+"Ange en ny logisk skrivare. Detta kan användas för att namnge en samling "
+"inställningar som du vill komma ihåg för framtida användning."
+
+#: src/gutenprintui2/panel.c:2150
 #, fuzzy
-msgid "UltraChrome Photo Black"
-msgstr "Sexfärgs foto"
+msgid "Set Printer Option Defaults"
+msgstr "Ställ in standardvärden"
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Bildstorlek"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Skalning:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Ändra skalningen (storleken) på bilden"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Skala efter:"
+
+#: 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 ""
+"Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
+"utdatapunkter per tum"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Procent"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Skala utskriften till storleken på sidan"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "Punkter per tum"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Skala utskriften till antalet punkter per tum"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Ställ in bredden på utskriften"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Ställ in bredden på utskriften"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Använd\n"
+"originalbildstorlek"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Ställ in storleken på utskriften till storleken på sidan"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Justera utskriftsfärg"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Ställ in standardvärden"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Stäng"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Förhandsgranskning av bild"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Utdata"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Utdatatyp:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Välj önskad typ av utdata"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Justera utdata..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Storleksenheter:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Enheter:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Välj grundenheten för utskrift"
+
+#: 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 "Skrivare"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Standardskrivare)"
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr "Skrivarfunktioner"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr ""
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr "Vanlig"
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr "Extra 1"
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr "Extra 2"
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr "Extra 3"
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr "Extra 4"
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr "Extra 5"
+
+# gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
+#
+#. 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
+msgid "English"
+msgstr "Swedish"
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "Mediastorlek:"
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "Jobbläge"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Gråtoner"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "Färg"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY-färg"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+#, fuzzy
+msgid "Color Precision"
+msgstr "Färgjustering"
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+#, fuzzy
+msgid "Reverse"
+msgstr "Bästa"
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Dubbelsidad utskrift"
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "Nej"
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#, fuzzy
+msgid "Value"
+msgstr "Blå"
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr "Finjustering"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil version "
+
+#: 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-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Följande text är en informell översättning som enbart tillhandahålls i\n"
+"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
+"originaltexten, som är bifogad nedan.\n"
+"\n"
+"Detta program är fri programvara. Du kan distribuera det och/eller\n"
+"modifiera det under villkoren i GNU General Public License, publicerad\n"
+"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
+"någon senare version.\n"
+"\n"
+"Detta program distribueras i hopp om att det ska vara användbart, men\n"
+"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
+"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
+"Public License för ytterligare information.\n"
+"\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
+"detta program. Om inte, skriv till Free Software Foundation, In.,\n"
+"59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
+
+#: src/escputil/escputil.c:119
+#, fuzzy
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\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 ""
+"Användning: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                     [-P skrivare | -r enhet] [-u] [-q] [-m modell] [ -S ]\n"
+"                [-C val] [-p mönster]\n"
+"Utför underhåll på EPSON Stylus®-skrivare.\n"
+"Exempel: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"         escputil --clean-head --new --printer-name MinKö\n"
+"\n"
+"  Kommandon:\n"
+"    -c|--clean-head    Rensa utskriftshuvudet.\n"
+"    -n|--nozzle-check  Skriv ut ett mönster för test av munstycken.\n"
+"                       Smutsiga eller igentäppta munstycken kommer att\n"
+"                       visas som mellanrum i mönstret. Om du ser några\n"
+"                       mellanrum bör du rensa utskriftshuvudet.\n"
+"    -a|--align-head    Justera utskriftshuvudet. VARNING: Felaktigt\n"
+"                       användande av detta verktyg kan resultera i dålig\n"
+"                       utskriftskvalitet och/eller skada på skrivaren.\n"
+"    -s|--status        Hämta skrivarstatus.\n"
+"    -i|--ink-level     Hämta information om bläcknivån i skrivaren. Detta\n"
+"                       kräver läs- och skrivrättigheter till den råa\n"
+"                       skrivarenheten.\n"
+"    -e|--extended-ink-info     Hämta utökad bläckinformation från\n"
+"                       skrivaren.  Detta kräver läs/skrivåtkomst till den "
+"råa\n"
+"                       skrivarenheten.\n"
+"    -d|--identify      Undersök skrivaren för information om märke och\n"
+"                       modell. Detta kräver läs- och skrivrättigheter till\n"
+"                       den råa skrivarenheten.\n"
+"    -l|--license       Visa licens- och garantivillkoren för detta program.\n"
+"    -M|--list-models   Visa de tillgängliga skrivarmodellerna.\n"
+"    -h|--help          Visa detta hjälpmeddelande.\n"
+"  Flaggor:\n"
+"    -P|--printer-name  Ange namnet på skrivarkön som ska användas.\n"
+"                       Standardalternativet är standardskrivaren på\n"
+"                       systemet.\n"
+"    -r|--raw-device    Ange namnet på den enhet att skriva till direkt\n"
+"                       istället för att gå via en skrivarkö.\n"
+"    -u|--new           Skrivaren är en ny skrivare (Stylus Color 740 eller\n"
+"                       nyare).\n"
+"    -q|--quiet         Visa inte rubriken.\n"
+"    -S|--short-name    Skriv ut det korta namnet på skrivaren med --"
+"identify.\n"
+"    -m|--model         Ange den exakta skrivarmodellen för justering av\n"
+"                       huvud.\n"
+"    -C|--choices       Ange antalet mönsterval för justering\n"
+"    -p|--patterns      Ange antalet uppsättningar av mönster för justering\n"
+
+#: src/escputil/escputil.c: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 ""
+"Användning: escputil [FLAGGOR] [KOMMANDO]\n"
+"Användning: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                     [-P skrivare | -r enhet] [-u] [-q] [-m modell] [ -S ]\n"
+"                [-C val] [-p mönster]\n"
+"Utför underhåll på EPSON Stylus®-skrivare.\n"
+"Exempel: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MinKö\n"
+"\n"
+"  Kommandon:\n"
+"    -c Rensa utskriftshuvudet.\n"
+"    -n Skriv ut ett mönster för test av munstycken.\n"
+"          Smutsiga eller igentäppta munstycken kommer att visas som\n"
+"          mellanrum i mönstret. Om du ser några mellanrum bör du rensa\n"
+"          utskriftshuvudet.\n"
+"    -a Justera utskriftshuvudet. VARNING: Felaktigt användande av detta\n"
+"          verktyg kan resultera i dålig utskriftskvalitet och/eller skada\n"
+"          på skrivaren.\n"
+"    -s Hämta skrivarstatus.\n"
+"    -i Hämta information om bläcknivån i skrivaren. Detta kräver läs- och\n"
+"          skrivrättigheter till den råa skrivarenheten.\n"
+"    -e Hämta utökade bläckinformationen från skrivaren.\n"
+"          Endast för R800-skrivare och vännter. Detta kräver\n"
+"          läs/skrivåtkomst till den råa skrivarenheten.\n"
+"    -d Undersök skrivaren för information om märke och modell. Detta\n"
+"          kräver läs- och skrivrättigheter till den råa skrivarenheten.\n"
+"    -l Visa licens- och garantivillkoren för detta program.\n"
+"    -M Visa de tillgängliga skrivarmodellerna.\n"
+"    -h Visa detta hjälpmeddelande.\n"
+"  Flaggor:\n"
+"    -P Ange namnet på skrivarkön som ska användas.\n"
+"          Standardalternativet är standardskrivaren på systemet.\n"
+"    -r Ange namnet på den enhet att skriva till direkt istället för att\n"
+"          gå via en skrivarkö.\n"
+"    -u Skrivaren är en ny skrivare (Stylus Color 740 eller nyare).\n"
+"    -q Visa inte rubriken.\n"
+"    -S Skriv ut det korta namnet på skrivaren med -d.\n"
+"    -m Ange den exakta skrivarmodellen för justering av huvud.\n"
+"    -C Ange antalet mönsterval för justering\n"
+"    -p Ange antalet uppsättningar mönster för justering\n"
+
+#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Du kan endast ange en skrivare eller rå enhet."
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Du kan endast ange en skrivarmodell."
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Justeringsval måste vara åtminstone 1."
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Okänd flagga %c\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Användning: %s [FLAGGOR] kommando\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Skriv \"%s --help\" för mer information.\n"
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Skriv \"%s -h\" för mer information.\n"
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Kan inte öppna enheten %s: %s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Kan inte skicka kommando till skrivare\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Läsning från skrivaren fick timeout\n"
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Kan inte läsa från %s: %s\n"
+
+#: src/escputil/escputil.c:729
+#, fuzzy, c-format
+msgid "Please specify a raw device\n"
+msgstr "Skrivarstatus kräver att en rå enhet används.\n"
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Okänd flagga %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Kan inte skriva till %s: %s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
 msgstr ""
+"\n"
+"Kan inte skriva till %s: %s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Kan inte detektera skrivartyp.\n"
+"Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
 msgid "Photo Black"
 msgstr "Fotosvart"
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
-msgstr "Matt svart"
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "Okänt"
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr "Ljus cyan"
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr "Ljus svart"
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
-msgstr "Mörk gul"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
+msgstr "Matt svart"
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr "Glansoptimerare"
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr "Ljus-ljus svart"
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
-msgstr "Snabbladdning av vanligt papper"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+#, fuzzy
+msgid "Orange"
+msgstr "Sida"
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
-msgid "Postcard"
-msgstr "Vykort"
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr "Status: Fel\n"
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
-msgid "Back Light Film"
-msgstr "Bakljusfilm"
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
-msgid "Matte Paper Heavyweight"
-msgstr "Matt tungt papper"
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Status: Upptagen\n"
 
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
-msgstr "Premium halvglansigt fotopapper"
+#: src/escputil/escputil.c:1031
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Status: Väntar\n"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-msgid "ColorLife Paper"
-msgstr "ColorLife-papper"
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Status: Overksam\n"
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-#, fuzzy
-msgid "Archival Matte Paper"
-msgstr "Matte-papper"
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Status: Pausad\n"
 
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Status: Rensar\n"
+
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
-msgstr "Rullmatning"
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Status: Stänger ner\n"
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Status: Okänt (%d)\n"
+
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Fel: Ödesdigert fel\n"
+
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "Manuell matning"
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "Skriv ut till cd"
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Fel: Slut på bläck\n"
+
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Fel: Slut på papper\n"
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Fel: Slut på papper\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Fel: Kortläsningsfel\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, fuzzy, c-format
+msgid "Error: Front cover open\n"
+msgstr "Fel: Ödesdigert fel\n"
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Fel: Okänt (%d)\n"
+
+#: src/escputil/escputil.c:1135
+#, fuzzy, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Varning: Svart bläcknivå är låg\n"
+
+#: src/escputil/escputil.c:1138
+#, fuzzy, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Varning: Svart bläcknivå är låg\n"
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Varning: Okänt (%d)\n"
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Skriver ut självtest av munstycke\n"
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Bläcknivåer:\n"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "Bläckfärg"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr "Återstående procent"
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "Skrivarnamn:"
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr "Jobbnamn: "
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr "bläcknivåer"
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "status"
+
+#: src/escputil/escputil.c:1393
+#, 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:1499
+#, 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:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "Datum"
+
+#: src/escputil/escputil.c:1713
+#, 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:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Kan inte identifiera skrivarmodellen.\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Rensar huvuden...\n"
+
+#: src/escputil/escputil.c:1770
+#, 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:1774
+#, 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 ""
+"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
+"\n"
+"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
+"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
+"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
+"verktygs korrekthet har inte granskats av Seiko Epson, och ingen som helst\n"
+"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
+"dig.\n"
+"\n"
+"Detta verktyg skriver ut %d testmönster. Varje mönster ser väldigt likt ut.\n"
+"Mönstren består av vertikala linjer som överlappar varandra. Under varje\n"
+"linjepar finns ett tal mellan %d och %d.\n"
+"\n"
+"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
+"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
+"linje. Granska paren väldigt noggrannt för att hitta de som passar bäst.\n"
+"Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
+"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
+"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
+"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
+"pappret i pappersfacket innan du anger det.\n"
+"\n"
+"Alla mönster är identiska, men de senare mönstren använder finare punkter\n"
+"för mer kritisk justering. Du måste genomföra alla passen för att justera\n"
+"skrivaren korrekt. Efter det att du har genomfört alla justeringspass\n"
+"kommer justeringsmönstren att skrivas ut en gång till. Du bör då finna att\n"
+"det mittersta paret (%d av %d) är det bästa av alla par.\n"
+"\n"
+"Efter att passen skrivs ut en gång till kommer du att erbjudas alternativen\n"
+"att spara resultaten (s), upprepa proceduren (r), eller avsluta utan att\n"
+"spara (q). Att avsluta kommer inte att återställa de tidigare värdena, men\n"
+"att stänga av och sätta på skrivaren kommer att göra det. Om du avslutar\n"
+"måste du upprepa hela proceduren om du vill spara resultaten senare.\n"
+"Det är viktigt att du inte stänger av din skrivare under denna process.\n"
+"\n"
+
+#: src/escputil/escputil.c:1809
+#, 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 ""
+"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
+"\n"
+"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
+"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
+"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
+"verktygs korrekthet har inte granskats av Seiko Epson, och ingen som helst\n"
+"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
+"dig.\n"
+"\n"
+"Detta verktyg skriver ut ett testmönster som består av vertikala linjer som\n"
+"överlappar varandra. Under varje linjepar finns ett tal mellan %d och %d.\n"
+"\n"
+"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
+"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
+"justering. Granska paren väldigt noggrannt för att hitta de som passar\n"
+"bäst. Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
+"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
+"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
+"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
+"pappret i pappersfacket innan du anger det.\n"
+"\n"
+"Efter det att du har kört justeringsmönstret kommer det att skrivas ut en\n"
+"gång till. Du bör då finna att det mittersta paret (%d av %d) är det bästa\n"
+"av alla par.\n"
+"Du kommer då att erbjudas alternativen att spara resultaten (s), upprepa\n"
+"proceduren (r), eller avsluta utan att spara (q). Att avsluta kommer inte\n"
+"att återställa de tidigare värdena, men att stänga av och sätta på\n"
+"skrivaren kommer att göra det.\n"
+"Om du avslutar måste du upprepa hela proceduren om du vill spara resultaten\n"
+"senare. Det är viktigt att du inte stänger av din skrivare under denna\n"
+"process.\n"
+"\n"
+
+#: src/escputil/escputil.c:1853
+#, 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:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr "Avslutar\n"
+
+#: src/escputil/escputil.c:1870
+#, 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 ""
+"Kontrollera den slutliga utskriften mycket noggrannt för att försäkra\n"
+"dig om att skrivaren är korrekt justerad. Du kan nu:\n"
+"  (s) Spara resultaten i skrivaren\n"
+"  (q) Avsluta utan att spara resultaten\n"
+"  (r) Upprepa hela förloppet från början\n"
+"Du kommer att få bekräfta ditt val.\n"
+"Vad vill du göra (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, 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:1892
+#, 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 ""
+"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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Bekräfta att du vill upprepa justeringsprocessen genom att\n"
+"ange \"r\" igen:\n"
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Upprepar justeringsprocessen.\n"
+
+#: src/escputil/escputil.c:1913
+#, 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 ""
+"Detta kommer att permanent ändra din skrivares konfiguration.\n"
+"VARNING: detta förlopp har inte godkänts av Seiko Epson, och kan\n"
+"skada din skrivare. Vill du fortsätta?\n"
+"Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
+"\"s\" igen:\n"
+
+#: src/escputil/escputil.c:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "Kommer att spara inställningar..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "misslyckades!\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Dina inställningar sparades inte utan problem. Du måste upprepa\n"
+"justeringsproceduren.\n"
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "lyckades!\n"
+
+#: src/escputil/escputil.c:1937
+#, 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:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Okänt kommando.\n"
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "Sista kommandot bekräftades inte.\n"
+
+#: src/escputil/escputil.c:1950
+#, fuzzy, 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 ""
+"Denna procedur förutsätter att din skrivare är en Epson %s.\n"
+"Om detta inte är din skrivarmodell bör du trycka Control+C nu\n"
+"och välja din rätta skrivarmodell.\n"
+"\n"
+"Placera ett pappersark i skrivaren för att påbörja justeringen\n"
+"av huvudena.\n"
+
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "Tryck retur för att fortsätta > "
+
+#: src/escputil/escputil.c:2026
+#, 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 ""
+"Granska utskriften och välj det bästa linjeparet i varje mönster.\n"
+"Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
+"proceduren.\n"
+
+#: src/escputil/escputil.c:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "Pass %d"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Mata in ett nytt pappersark.\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Numret är utanför intervallet!\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Jag kan inte förstå vad du skrev!\n"
+
+#: src/escputil/escputil.c:2077
+#, 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:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Försöker ställa in justering..."
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "lyckades.\n"
+
+#: src/escputil/escputil.c:2088
+#, 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 ""
+"Verifiera att justeringen är korrekt. Efter det att justeringsmönstret\n"
+"skrivits ut igen bör du försäkra dig om att det bästa mönstret för varje\n"
+"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:2134
+#, c-format
+msgid "Error in input\n"
+msgstr "Fel i indata\n"
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Skriver ut..."
+
+#: 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:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
 #, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuell matning"
+msgid "Bright White Paper"
+msgstr "Matte-papper"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
+msgid "Postcard"
+msgstr "Vykort"
+
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
+msgid "Back Light Film"
+msgstr "Bakljusfilm"
+
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
+msgid "Matte Paper Heavyweight"
+msgstr "Matt tungt papper"
 
-#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuell matning"
+msgid "Premium Presentation Paper Matte"
+msgstr "Fotopapper med premiumlyster"
 
-#: src/main/escp2-papers.c:1961
+#: src/xml/xmli18n-tmp.h:27
 #, fuzzy
-msgid "Rear Tray"
-msgstr "Fack"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premiumglansigt fotopapper"
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:29
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premiumglansigt fotopapper"
 
-#: src/main/escp2-papers.c:1988
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Glansigt fotopapper"
+
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
+msgstr "Premium halvglansigt fotopapper"
+
+#: src/xml/xmli18n-tmp.h:35
 #, fuzzy
-msgid "Photo Board"
-msgstr "Fotosvart"
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Premium halvglansigt fotopapper"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:37
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Premium halvglansigt fotopapper"
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:41
+#, fuzzy
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Fotopapper med premiumlyster"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Premiumglansigt fotopapper"
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+msgid "ColorLife Paper"
+msgstr "ColorLife-papper"
+
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
+msgstr "Snabbladdning av vanligt papper"
+
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+#, fuzzy
+msgid "Archival Matte Paper"
+msgstr "Matte-papper"
+
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
 #, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Välj automatiskt"
+msgid "UltraChrome Photo Black"
+msgstr "Sexfärgs foto"
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 × 90 DPI snabb ekonomi"
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
-msgstr "360 × 120 DPI ekonomi"
-
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
 msgid "180 DPI Economy"
 msgstr "180 DPI ekonomi"
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
 msgid "360 x 180 DPI Draft"
 msgstr "360 × 180 DPI utdrag"
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
-msgstr "360 × 240 DPI utdrag"
-
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 DPI hög kvalitet"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 × 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
-msgstr "720 DPI hög kvalitet"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
+msgstr "360 × 120 DPI ekonomi"
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 DPI högsta kvalitet"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr "360 × 240 DPI utdrag"
 
-#: src/main/escp2-resolutions.c:106
-msgid "720 x 720 DPI"
-msgstr "720 × 720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr "720 DPI hög kvalitet"
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 720 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-msgid "1440 x 720 DPI Transposed"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 × 720 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
-msgid "2880 x 1440 DPI Transposed"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:162
-msgid "5760 x 1440 DPI"
-msgstr "5760 × 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr "Mörk gul"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
+msgid "5760 x 1440 DPI"
+msgstr "5760 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 msgid "5760 x 2880 DPI"
 msgstr "5760 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
-msgstr "PÃ¥"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+msgid "1440 x 720 DPI Transposed"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
 #, fuzzy
-msgid "Interleave"
-msgstr "Skrivarnamn:"
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 × 360 DPI"
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
-msgstr "Full överlappning"
+#: src/xml/xmli18n-tmp.h:2922
+#, fuzzy
+msgid "Black 1"
+msgstr "Svart"
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "Svart"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 × 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 × 720 DPI högsta kvalitet"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Fack"
+
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "Manuell matning"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "Skriv ut till cd"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
+msgstr "Rullmatning"
+
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
 #, fuzzy
-msgid "Interleave 2"
-msgstr "Skrivarnamn:"
+msgid "Manual Sheet Guide"
+msgstr "Manuell matning"
 
-#: src/main/escp2-resolutions.c:594
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
 #, fuzzy
-msgid "Eight Pass"
-msgstr "Ljusstyrka:"
+msgid "Manual Feed (Front)"
+msgstr "Manuell matning"
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Snabb ekonomi"
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotosvart"
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Ekonomi"
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Utdrag"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
-msgstr "Hög"
+#: src/xml/xmli18n-tmp.h:3107
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Välj automatiskt"
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Foto"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
+msgstr "Enfärgers rå"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
+msgstr "Trefärgers rå"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr "Fyrfärgers rå"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
+msgstr "Femfärgers rå"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
+msgstr "Sexfärgers rå"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Enfärgers rå förbättrad glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+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:3168 src/xml/xmli18n-tmp.h:3189
+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:3169 src/xml/xmli18n-tmp.h:3190
+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:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Sjufärgers förbättrad glansig rå"
+
+#: src/xml/xmli18n-tmp.h:3210
 #, fuzzy
-msgid "Ultra Photo"
-msgstr "Sexfärgs foto"
+msgid "Default Black"
+msgstr "Standard"
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
-msgstr "Bästa"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
+msgstr "Sjufärgs foto"
 
-#: src/main/generic-options.c:46
-msgid "Text"
-msgstr "Text"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
+msgstr "Sexfärgs förbättrad sammansatt"
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
-msgstr "Grafik"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
+msgstr "Sjufärgers rå"
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
-msgstr "Blandat text och grafik"
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
+msgstr "Tvånivås gråton"
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "Fotografi"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
+msgstr "Tvåfärgers rå"
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
-msgstr "Linjegrafik"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
+msgstr "Åttafärgers foto"
 
-#: src/main/generic-options.c:55
-msgid "Page"
-msgstr "Sida"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
+msgstr "Åttafärgers rå"
 
-#: src/main/generic-options.c:56
-msgid "Job"
-msgstr "Jobb"
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+#, fuzzy
+msgid "Four Color Photo"
+msgstr "Sexfärgs foto"
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
-msgstr "Bildtyp"
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+#, fuzzy
+msgid "Interleave"
+msgstr "Skrivarnamn:"
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
-msgstr "Typ av bild som ska skrivas ut"
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr "Full överlappning"
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
-msgstr "Jobbläge"
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
-msgstr "Jobb mot sidläge"
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
-msgstr "Sidnummer"
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+#, fuzzy
+msgid "Interleave 2"
+msgstr "Skrivarnamn:"
 
-#: src/main/generic-options.c:81
-msgid "Page number"
-msgstr "Sidnummer"
+#: src/xml/xmli18n-tmp.h:3533
+#, fuzzy
+msgid "Eight Pass"
+msgstr "Ljusstyrka:"
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr "PÃ¥"
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 fotopapper"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22×30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Liggande"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr "Amerikansk folio"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr "Europeisk folio"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr "Large crown quarto"
 
 # får plats
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr "Royal quarto"
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr "Large crown octavo"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr "Royal octavo"
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr "Liten pocket"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr "Liten pingvinpocket"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr "Stor pingvinpocket"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr "Hagaki-kort"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr "Oufuku-kort"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr "A2-inbjudan"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr "Monarkkuvert"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Monarkkuvert"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr "Kort"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr "Brett vykort"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "Anpassat"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr "89 mm rullpapper"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210 mm rullpapper"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "13 tum rullpapper"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "36 tum rullpapper"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "4 tum rullpapper"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr "PostScript nivå 1"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr "PostScript nivå 2"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+#, fuzzy
+msgid "Canon PIXMA MP160"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:3800
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "Epson E 150"
+
+#: src/xml/xmli18n-tmp.h:3828
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3968
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:3969
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
+#, fuzzy
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/xml/xmli18n-tmp.h:3988
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:386
-msgid "Epson Stylus Photo R800"
-msgstr "Epson Stylus Photo R800"
-
-#: src/main/xmli18n-tmp.h:387
-msgid "Epson Stylus Photo R1800"
-msgstr "Epson Stylus Photo R1800"
+#: src/xml/xmli18n-tmp.h:3989
+#, fuzzy
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:388
-msgid "Epson Stylus Photo R2400"
-msgstr "Epson Stylus Photo R2400"
+#: src/xml/xmli18n-tmp.h:3990
+#, fuzzy
+msgid "Epson Stylus Photo TX800W"
+msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:4050
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "Epson Stylus CX3700"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+#, fuzzy
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate"
+
+#: src/xml/xmli18n-tmp.h:4096
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+#, fuzzy
+msgid "Epson WorkForce 30"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:4129
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "Epson PX G900"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "Epson PX V500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:4187
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:4191
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
-msgstr "Brother HL-4Ve"
-
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
-msgstr "Brother HL-10V"
-
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
-msgstr "Brother HL-10h"
-
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
-msgstr "Brother HL-630"
-
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
-msgstr "Brother HL-660"
-
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
-msgstr "Brother HL-760"
-
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
-msgstr "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4211
+#, fuzzy
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/xml/xmli18n-tmp.h:4212
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:4213
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:4214
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:4215
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:4218
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/xml/xmli18n-tmp.h:4219
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/xml/xmli18n-tmp.h:4220
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:4221
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:4222
+#, fuzzy
+msgid "Brother HL-1430"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4223
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4224
+#, fuzzy
+msgid "Brother HL-1450"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4225
+#, fuzzy
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4226
+#, fuzzy
+msgid "Brother HL-1650"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+#, fuzzy
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4229
+#, fuzzy
+msgid "Brother HL-1850"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4230
+#, fuzzy
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+#, fuzzy
+msgid "Brother HL-2460"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:4233
+#, fuzzy
+msgid "Brother HL-2460N"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:4235
+#, fuzzy
+msgid "Brother HL-5030"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4236
+#, fuzzy
+msgid "Brother HL-5040"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4237
+#, fuzzy
+msgid "Brother HL-5050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4238
+#, fuzzy
+msgid "Brother HL-5070N"
+msgstr "Brother HL-1070"
+
+#: src/xml/xmli18n-tmp.h:4239
+#, fuzzy
+msgid "Brother HL-5140"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:4240
+#, fuzzy
+msgid "Brother HL-5150D"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4241
+#, fuzzy
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:4244
+#, fuzzy
+msgid "Brother HL-7050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4245
+#, fuzzy
+msgid "Brother HL-7050N"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4284
+#, fuzzy
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 msgid "Generic PCL 4 Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 msgid "Generic PCL 5 Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 msgid "Generic PCL 5c Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 msgid "Generic PCL 5e Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+#, fuzzy
+msgid "Gestetner MP 5000"
+msgstr "Epson MC 5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+#, fuzzy
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:4525
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+#, fuzzy
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4529
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+#, fuzzy
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2100"
+
+#: src/xml/xmli18n-tmp.h:4534
+#, fuzzy
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 1220"
+
+#: src/xml/xmli18n-tmp.h:4535
+#, fuzzy
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2300"
+
+#: src/xml/xmli18n-tmp.h:4536
+#, fuzzy
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:4537
+#, fuzzy
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4538
+#, fuzzy
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4539
+#, fuzzy
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4540
+#, fuzzy
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:4541
+#, fuzzy
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4542
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+#, fuzzy
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4551
+#, fuzzy
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4552
+#, fuzzy
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:4553
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+#, fuzzy
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4200"
+
+#: src/xml/xmli18n-tmp.h:4558
+#, fuzzy
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4559
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+#, fuzzy
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:4561
+#, fuzzy
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4562
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+#, fuzzy
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4565
+#, fuzzy
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:4566
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+#, fuzzy
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9000"
+
+#: src/xml/xmli18n-tmp.h:4571
+#, fuzzy
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4572
+#, fuzzy
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:4573
+#, fuzzy
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4574
+#, fuzzy
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4575
+#, fuzzy
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:4576
+#, fuzzy
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4577
+#, fuzzy
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4578
+#, fuzzy
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:4579
+#, fuzzy
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:4580
+#, fuzzy
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:4581
+#, fuzzy
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4582
+#, fuzzy
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+#, fuzzy
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4664
+#, fuzzy
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+#, fuzzy
+msgid "Infotec IS2035"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4670
+#, fuzzy
+msgid "Infotec IS2045"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+#, fuzzy
+msgid "Infotec IS2105"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4673
+#, fuzzy
+msgid "Infotec IS 2015"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4674
+#, fuzzy
+msgid "Infotec IS 2018"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+#, fuzzy
+msgid "Infotec IS 2060"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4677
+#, fuzzy
+msgid "Infotec IS 2075"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4678
+#, fuzzy
+msgid "Infotec IS 2122"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4679
+#, fuzzy
+msgid "Infotec IS 2127"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4680
+#, fuzzy
+msgid "Infotec IS 2132"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4681
+#, fuzzy
+msgid "Infotec IS 2135"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4682
+#, fuzzy
+msgid "Infotec IS 2145"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4683
+#, fuzzy
+msgid "Infotec IS 2151"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4684
+#, fuzzy
+msgid "Infotec IS 2160"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4685
+#, fuzzy
+msgid "Infotec IS 2175"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4686
+#, fuzzy
+msgid "Infotec IS 2215"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4687
+#, fuzzy
+msgid "Infotec IS 2216"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4688
+#, fuzzy
+msgid "Infotec IS 2220"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+#, fuzzy
+msgid "Infotec IS 2225"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4691
+#, fuzzy
+msgid "Infotec IS 2230"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4692
+#, fuzzy
+msgid "Infotec IS 2235"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4693
+#, fuzzy
+msgid "Infotec IS 2245"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4694
+#, fuzzy
+msgid "Infotec IS 2255"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4695
+#, fuzzy
+msgid "Infotec IS 2265"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4696
+#, fuzzy
+msgid "Infotec IS 2275"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4697
+#, fuzzy
+msgid "Infotec IS 2316"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4698
+#, fuzzy
+msgid "Infotec IS 2320"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4699
+#, fuzzy
+msgid "Infotec IS 2325"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4700
+#, fuzzy
+msgid "Infotec IS 2416"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4701
+#, fuzzy
+msgid "Infotec IS 2425"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4702
+#, fuzzy
+msgid "Infotec IS 2430"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4703
+#, fuzzy
+msgid "Infotec IS 2435"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4704
+#, fuzzy
+msgid "Infotec IS 2445"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4705
+#, fuzzy
+msgid "Infotec IS 3090"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4706
+#, fuzzy
+msgid "Infotec IS 3110"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4707
+#, fuzzy
+msgid "Infotec IS 3135"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4708
+#, fuzzy
+msgid "Infotec MP 2550"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+#, fuzzy
+msgid "Infotec MP 3350"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+#, fuzzy
+msgid "Infotec MP 4000"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+#, fuzzy
+msgid "Infotec MP 5000"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:935
-msgid "Lexmark Optra E"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
-msgstr "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-#, fuzzy
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Optra E"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
-msgstr "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
-msgstr "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
-msgstr "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
-msgstr "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
-msgstr "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
-msgstr "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
-msgstr "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
-msgstr "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
-msgstr "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
-msgstr "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
-msgstr "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
-msgstr "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
-msgstr "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
-msgstr "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
-msgstr "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
-msgstr "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
-msgstr "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
-msgstr "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
-msgstr "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
-msgstr "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
-msgstr "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
-msgstr "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
-msgstr "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
-msgstr "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
-msgstr "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
-msgstr "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
-msgstr "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
-msgstr "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
-msgstr "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4794
+#, fuzzy
+msgid "Lanier MP 1100"
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
-msgstr "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4795
+#, fuzzy
+msgid "Lanier LD1100"
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
-msgstr "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr "Panasonic KX-P4410"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
-msgstr "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
-msgstr "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
-msgstr "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
-msgstr "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
-msgstr "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
-msgstr "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
-msgstr "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
-msgstr "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
-msgstr "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
-msgstr "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
-msgstr "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
-msgstr "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
-msgstr "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
-msgstr "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
-msgstr "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
-msgstr "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
-msgstr "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4814
+#, fuzzy
+msgid "Lanier MP 3350"
+msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
-msgstr "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
-msgstr "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-#, fuzzy
-msgid "Sharp AR-M257"
-msgstr "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-msgid "Sony IJP-V100"
-msgstr "Sony IJP-V100"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
-msgstr "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4820
+#, fuzzy
+msgid "Lanier MP 4000"
+msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:993
-msgid "Star LaserPrinter 8"
-msgstr "Star LaserPrinter 8"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
-msgstr "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
-msgstr "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
-msgstr "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
-msgstr "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
-msgstr "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4826
+#, fuzzy
+msgid "Lanier MP 5000"
+msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr "Xerox DocuPrint N4512PS"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
-msgstr "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
-msgstr "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
-msgstr "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-#, fuzzy
-msgid "Xerox WorkCentre M118"
-msgstr "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:4834
 #, fuzzy
-msgid "Lexmark X73"
-msgstr "Lexmark Z43"
+msgid "Lanier MP 9000"
+msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
+#: src/xml/xmli18n-tmp.h:4837
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:1011
-msgid "Olympus P-10"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4839
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1012
-msgid "Olympus P-11"
-msgstr "Olympus P-11"
+#: src/xml/xmli18n-tmp.h:4840
+#, fuzzy
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1013
-msgid "Olympus P-200"
-msgstr "Olympus P-200"
+#: src/xml/xmli18n-tmp.h:4841
+#, fuzzy
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:1014
-msgid "Olympus P-300"
-msgstr "Olympus P-300"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:1015
-msgid "Olympus P-300E"
-msgstr "Olympus P-300E"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:1016
-msgid "Olympus P-300U"
-msgstr "Olympus P-300U"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:1017
-msgid "Olympus P-330E"
-msgstr "Olympus P-330E"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:1018
-msgid "Olympus P-330NE"
-msgstr "Olympus P-330NE"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:1019
-msgid "Olympus P-400"
-msgstr "Olympus P-400"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:1020
-msgid "Olympus P-440"
-msgstr "Olympus P-440"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:1021
-#, fuzzy
-msgid "Olympus P-S100"
-msgstr "Olympus P-10"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:1022
-#, fuzzy
-msgid "Canon CP-10"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:1023
-msgid "Canon CP-100"
-msgstr "Canon CP-100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:1024
-msgid "Canon CP-200"
-msgstr "Canon CP-200"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:1025
-msgid "Canon CP-220"
-msgstr "Canon CP-220"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:1026
-msgid "Canon CP-300"
-msgstr "Canon CP-300"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:1027
-msgid "Canon CP-330"
-msgstr "Canon CP-330"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-#, fuzzy
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-#, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-#, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-#, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-#, fuzzy
-msgid "Sony DPP-EX5"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-#, fuzzy
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DR150"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix-CX-550"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-#, fuzzy
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm Printpix-CX-400"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
-msgstr "RÃ… DATA 16-bitar"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
-msgstr "RÃ… DATA 8-bitar"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
-msgstr "Kurvtyp"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "Minimalt X"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
-msgstr "Minimalt möjligt värde för X"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "Maximalt X"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
-msgstr "Maximalt möjligt X-värde"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Minimalt Y"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
-msgstr "Minimalt möjligt värde för Y"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Maximalt Y"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
-msgstr "Maximalt möjligt värde för Y"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
+msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "_Gammavärde"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "Tum"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "Ställ in grundenheten till tum"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "cm"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "Ställ in grundenheten till centimeter"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
-msgstr "Punkter"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Ställ in grundenheten för mått till punkter (1/72\")"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "mm"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "Ställ in grundenheten för mått till millimeter"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "Pica"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Ställ in grundenheten för mått till pica (1/12\")"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "Färgutdata"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "Skriv ut i gråtoner genom att använda svart bläck"
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "Standard kommando"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "Använd standardkommando för utskrift"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "Anpassat kommando"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "Använd anpassat kommando för utskrift"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "Fil"
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "Skriv ut till en fil"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
-msgstr "Redigera kurva..."
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
-msgstr "Ställ in standard"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
-msgstr "Återställ föregående"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "OK"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "Konfigurera skrivare..."
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-#, fuzzy
-msgid "Reset"
-msgstr "Bästa"
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- Utskrift v%s"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "Om"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
 msgstr ""
-"Skriv ut och\n"
-"spara inställningar"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
 msgstr ""
-"Spara\n"
-"inställningar"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "Skriv ut"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "Förhandsgranskning"
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
 msgstr ""
-"Positionera bilden på sidan.\n"
-"Klicka och dra med huvudknappen för att positionera bilden.\n"
-"Klicka och dra med den andra knappen för att flytta bilden med finare "
-"precision; varje flyttenhet flyttar bilden med en punkt (1/72\")\n"
-"Klicka och dra med den tredje (mittersta) musknappen för att flytta bilden i "
-"enheter av bildstorleken.\n"
-"Att hålla ned skifttangenten vid klickande och dragande begränsar flytten "
-"till rörelse i endast horisontell och vertikal led.\n"
-"Om du klickar någon annan knapp under tiden du drar med musen kommer bilden "
-"att återgå till sin ursprungliga position."
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "Pappersstorlek"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "Visa alla pappersstorlekar"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "Dimensioner:"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "Bredd:"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "Bredd på pappret som du vill skriva ut till"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "Höjd:"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "Höjd på pappret som du vill skriva ut till"
+#: src/xml/xmli18n-tmp.h:4929
+#, fuzzy
+msgid "Oki OL400"
+msgstr "Okidata OL400"
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
-msgstr "Automatisk pappersstorlek"
+#: src/xml/xmli18n-tmp.h:4930
+#, fuzzy
+msgid "Oki OL400e"
+msgstr "Okidata OL400e"
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "Antal kopior"
+#: src/xml/xmli18n-tmp.h:4931
+#, fuzzy
+msgid "Oki OL400ex"
+msgstr "Okidata OL400ex"
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Välj antalet kopior att skriva ut; ett värde mellan 1 och 100"
+#: src/xml/xmli18n-tmp.h:4932
+#, fuzzy
+msgid "Oki OL410e"
+msgstr "Okidata OL410e"
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "Bildposition"
+#: src/xml/xmli18n-tmp.h:4933
+#, fuzzy
+msgid "Oki OL600e"
+msgstr "Okidata OL600e"
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "Automatisk"
+#: src/xml/xmli18n-tmp.h:4934
+#, fuzzy
+msgid "Oki OL610e/S"
+msgstr "Okidata OL610e/S"
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "Stående"
+#: src/xml/xmli18n-tmp.h:4935
+#, fuzzy
+msgid "Oki OL800"
+msgstr "Okidata OL800"
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "Liggande"
+#: src/xml/xmli18n-tmp.h:4936
+#, fuzzy
+msgid "Oki OL810ex"
+msgstr "Okidata OL810ex"
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "Uppochner"
+#: src/xml/xmli18n-tmp.h:4937
+#, fuzzy
+msgid "Oki Okipage 6e"
+msgstr "Okidata Okipage 6e"
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "Liggande uppochner"
+#: src/xml/xmli18n-tmp.h:4938
+#, fuzzy
+msgid "Oki Okipage 6ex"
+msgstr "Okidata Okipage 6ex"
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr ""
-"Välj orientering: stående, liggande, uppochner eller liggande uppochner"
+#: src/xml/xmli18n-tmp.h:4939
+#, fuzzy
+msgid "Oki Okipage 8p"
+msgstr "Okidata Okipage 8p"
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "Orientering:"
+#: src/xml/xmli18n-tmp.h:4940
+#, fuzzy
+msgid "Oki Okipage 10e"
+msgstr "Okidata Okipage 10e"
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "Vänster:"
+#: src/xml/xmli18n-tmp.h:4941
+#, fuzzy
+msgid "Oki Okipage 10ex"
+msgstr "Okidata Okipage 10ex"
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "Avstånd från vänsterkanten på pappret till bilden"
+#: src/xml/xmli18n-tmp.h:4942
+#, fuzzy
+msgid "Oki Okipage 14ex"
+msgstr "Okidata Okipage 14ex"
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "Höger:"
+#: src/xml/xmli18n-tmp.h:4943
+#, fuzzy
+msgid "Oki Super 6e"
+msgstr "Okidata Super 6e"
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden"
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "Avstånd från högerkanten på pappret till bilden"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "Övre kant:"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "Avstånd från överkanten på pappret till bilden"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "Nedre kant:"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Avstånd från överkanten på pappret till nederkanten på bilden"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "Avstånd från nederkanten på pappret till bilden"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "Centrera:"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "Horisontal"
+#: src/xml/xmli18n-tmp.h:4952
+#, fuzzy
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "Centrera bilden horisontellt på pappret"
+#: src/xml/xmli18n-tmp.h:4953
+#, fuzzy
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "BÃ¥de och"
+#: src/xml/xmli18n-tmp.h:4954
+#, fuzzy
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "Centrera bilden på pappret"
+#: src/xml/xmli18n-tmp.h:4955
+#, fuzzy
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "Vertikal"
+#: src/xml/xmli18n-tmp.h:4956
+#, fuzzy
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "Centrera bilden vertikalt på pappret"
+#: src/xml/xmli18n-tmp.h:4957
+#, fuzzy
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "Konfigurera skrivare"
+#: src/xml/xmli18n-tmp.h:4958
+#, fuzzy
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
-msgstr "Skrivarmärke:"
+#: src/xml/xmli18n-tmp.h:4959
+#, fuzzy
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
-msgstr "Välj märke på din skrivare"
+#: src/xml/xmli18n-tmp.h:4960
+#, fuzzy
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "Skrivarmodell:"
+#: src/xml/xmli18n-tmp.h:4961
+#, fuzzy
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "Välj modell på din skrivare"
+#: src/xml/xmli18n-tmp.h:4962
+#, fuzzy
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD-fil:"
+#: src/xml/xmli18n-tmp.h:4963
+#, fuzzy
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "Ange rätt PPD-filnamn för din skrivare"
+#: src/xml/xmli18n-tmp.h:4964
+#, fuzzy
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "Bläddra"
+#: src/xml/xmli18n-tmp.h:4965
+#, fuzzy
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "Välj rätt PPD-filnamn för din skrivare"
+#: src/xml/xmli18n-tmp.h:4966
+#, fuzzy
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
-msgstr ""
-"Välj namnet på utskriftskön (inte skrivarens typ eller modell) som du vill "
-"skriva ut på"
+#: src/xml/xmli18n-tmp.h:4967
+#, fuzzy
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "Skrivarkö:"
+#: src/xml/xmli18n-tmp.h:4968
+#, fuzzy
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "Ange korrekt kommando för att skriva ut på din skrivare. "
+#: src/xml/xmli18n-tmp.h:4969
+#, fuzzy
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "Ange filen att skriva till. "
+#: src/xml/xmli18n-tmp.h:4970
+#, fuzzy
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
-msgstr "Fil att skriva ut till"
+#: src/xml/xmli18n-tmp.h:4971
+#, fuzzy
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "Skriv ut till fil"
+#: src/xml/xmli18n-tmp.h:4972
+#, fuzzy
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "Ange ny skrivare"
+#: src/xml/xmli18n-tmp.h:4973
+#, fuzzy
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "Skrivarnamn:"
+#: src/xml/xmli18n-tmp.h:4974
+#, fuzzy
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "Ange det namn som du vill ge denna logiska skrivare"
+#: src/xml/xmli18n-tmp.h:4975
+#, fuzzy
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "Om Gutenprint "
+#: src/xml/xmli18n-tmp.h:4976
+#, fuzzy
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Gutenprint version "
+#: src/xml/xmli18n-tmp.h:4977
+#, fuzzy
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "Skrivarinställningar"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr ""
-"Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
-"skriva ut till"
+#: src/xml/xmli18n-tmp.h:4979
+#, fuzzy
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "Konfigurera skrivare..."
+#: src/xml/xmli18n-tmp.h:4980
+#, fuzzy
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr ""
-"Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut "
-"till denna skrivare"
+#: src/xml/xmli18n-tmp.h:4981
+#, fuzzy
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "Ny skrivare..."
+#: src/xml/xmli18n-tmp.h:4982
+#, fuzzy
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2093
-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 ""
-"Ange en ny logisk skrivare. Detta kan användas för att namnge en samling "
-"inställningar som du vill komma ihåg för framtida användning."
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2123
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
+
+#: src/xml/xmli18n-tmp.h:4985
 #, fuzzy
-msgid "Set Printer Option Defaults"
-msgstr "Ställ in standardvärden"
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4986
+#, fuzzy
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "Bildstorlek"
+#: src/xml/xmli18n-tmp.h:4987
+#, fuzzy
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "Skalning:"
+#: src/xml/xmli18n-tmp.h:4988
+#, fuzzy
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "Ändra skalningen (storleken) på bilden"
+#: src/xml/xmli18n-tmp.h:4989
+#, fuzzy
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
-msgstr "Skala efter:"
+#: src/xml/xmli18n-tmp.h:4990
+#, fuzzy
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr ""
-"Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
-"utdatapunkter per tum"
+#: src/xml/xmli18n-tmp.h:4991
+#, fuzzy
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "Procent"
+#: src/xml/xmli18n-tmp.h:4992
+#, fuzzy
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "Skala utskriften till storleken på sidan"
+#: src/xml/xmli18n-tmp.h:4993
+#, fuzzy
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "Punkter per tum"
+#: src/xml/xmli18n-tmp.h:4994
+#, fuzzy
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "Skala utskriften till antalet punkter per tum"
+#: src/xml/xmli18n-tmp.h:4995
+#, fuzzy
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "Ställ in bredden på utskriften"
+#: src/xml/xmli18n-tmp.h:4996
+#, fuzzy
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio 220"
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "Ställ in bredden på utskriften"
+#: src/xml/xmli18n-tmp.h:4997
+#, fuzzy
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
-msgstr ""
-"Använd\n"
-"originalbildstorlek"
+#: src/xml/xmli18n-tmp.h:4998
+#, fuzzy
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "Ställ in storleken på utskriften till storleken på sidan"
+#: src/xml/xmli18n-tmp.h:4999
+#, fuzzy
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "Justera utskriftsfärg"
+#: src/xml/xmli18n-tmp.h:5000
+#, fuzzy
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio 401"
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
-msgstr "Ställ in standardvärden"
+#: src/xml/xmli18n-tmp.h:5001
+#, fuzzy
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "Stäng"
+#: src/xml/xmli18n-tmp.h:5002
+#, fuzzy
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "Förhandsgranskning av bild"
+#: src/xml/xmli18n-tmp.h:5003
+#, fuzzy
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5004
+#, fuzzy
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
-msgstr "Utdata"
+#: src/xml/xmli18n-tmp.h:5005
+#, fuzzy
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
-msgstr "Utdatatyp:"
+#: src/xml/xmli18n-tmp.h:5006
+#, fuzzy
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio 700"
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "Välj önskad typ av utdata"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "Justera utdata..."
+#: src/xml/xmli18n-tmp.h:5008
+#, fuzzy
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr ""
-"Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm"
+#: src/xml/xmli18n-tmp.h:5009
+#, fuzzy
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "Storleksenheter:"
+#: src/xml/xmli18n-tmp.h:5010
+#, fuzzy
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
-msgstr " "
+#: src/xml/xmli18n-tmp.h:5011
+#, fuzzy
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-4600"
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "Enheter:"
+#: src/xml/xmli18n-tmp.h:5012
+#, fuzzy
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "Välj grundenheten för utskrift"
+#: src/xml/xmli18n-tmp.h:5013
+#, fuzzy
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-7050"
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:5014
+#, fuzzy
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:5015
+#, fuzzy
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-6100"
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5016
+#, fuzzy
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5017
+#, fuzzy
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5018
+#, fuzzy
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5019
+#, fuzzy
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-85"
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5020
+#, fuzzy
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-7050"
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "Skrivare"
+#: src/xml/xmli18n-tmp.h:5021
+#, fuzzy
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-7050"
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(Standardskrivare)"
+#: src/xml/xmli18n-tmp.h:5022
+#, fuzzy
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-85"
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "Skrivarfunktioner"
+#: src/xml/xmli18n-tmp.h:5023
+#, fuzzy
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-85"
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
 
-#: src/cups/genppd.c:151
-msgid "Common"
-msgstr "Vanlig"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
-msgstr "Extra 1"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
-msgstr "Extra 2"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
-msgstr "Extra 3"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
-msgstr "Extra 4"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
-msgstr "Extra 5"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
 
-# gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
-#
-#. 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:1064
-msgid "English"
-msgstr "Swedish"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
-msgstr "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5032
+#, fuzzy
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7000"
 
-#: src/cups/genppd.c:1647
+#: src/xml/xmli18n-tmp.h:5033
 #, fuzzy
-msgid "2-Sided Printing"
-msgstr "Dubbelsidad utskrift"
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7000N"
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
+
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "Nej"
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
+msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "Ja"
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
+msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-#, fuzzy
-msgid "Value"
-msgstr "Blå"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
-msgstr "Finjustering"
+#: src/xml/xmli18n-tmp.h:5043
+#, fuzzy
+msgid "Savin 2560"
+msgstr "Canon S450"
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil version "
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
+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"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"Följande text är en informell översättning som enbart tillhandahålls i\n"
-"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
-"originaltexten, som är bifogad nedan.\n"
-"\n"
-"Detta program är fri programvara. Du kan distribuera det och/eller\n"
-"modifiera det under villkoren i GNU General Public License, publicerad\n"
-"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
-"någon senare version.\n"
-"\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men\n"
-"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
-"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
-"Public License för ytterligare information.\n"
-"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
-"detta program. Om inte, skriv till Free Software Foundation, In.,\n"
-"59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
 
-#: src/escputil/escputil.c:119
+#: src/xml/xmli18n-tmp.h:5046
 #, fuzzy
-msgid ""
-"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
-"                [-C choices] [-p patterns]\n"
-"Perform maintenance on EPSON Stylus (R) printers.\n"
-"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"          escputil --clean-head --new --printer-name MyQueue\n"
-"\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"
+msgid "Savin 40105"
+msgstr "Raven LP-410"
+
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
-"Användning: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                     [-P skrivare | -r enhet] [-u] [-q] [-m modell] [ -S ]\n"
-"                [-C val] [-p mönster]\n"
-"Utför underhåll på EPSON Stylus®-skrivare.\n"
-"Exempel: escputil --ink-level --raw-device /dev/usb/lp0\n"
-"         escputil --clean-head --new --printer-name MinKö\n"
-"\n"
-"  Kommandon:\n"
-"    -c|--clean-head    Rensa utskriftshuvudet.\n"
-"    -n|--nozzle-check  Skriv ut ett mönster för test av munstycken.\n"
-"                       Smutsiga eller igentäppta munstycken kommer att\n"
-"                       visas som mellanrum i mönstret. Om du ser några\n"
-"                       mellanrum bör du rensa utskriftshuvudet.\n"
-"    -a|--align-head    Justera utskriftshuvudet. VARNING: Felaktigt\n"
-"                       användande av detta verktyg kan resultera i dålig\n"
-"                       utskriftskvalitet och/eller skada på skrivaren.\n"
-"    -s|--status        Hämta skrivarstatus.\n"
-"    -i|--ink-level     Hämta information om bläcknivån i skrivaren. Detta\n"
-"                       kräver läs- och skrivrättigheter till den råa\n"
-"                       skrivarenheten.\n"
-"    -e|--extended-ink-info     Hämta utökad bläckinformation från\n"
-"                       skrivaren.  Detta kräver läs/skrivåtkomst till den "
-"råa\n"
-"                       skrivarenheten.\n"
-"    -d|--identify      Undersök skrivaren för information om märke och\n"
-"                       modell. Detta kräver läs- och skrivrättigheter till\n"
-"                       den råa skrivarenheten.\n"
-"    -l|--license       Visa licens- och garantivillkoren för detta program.\n"
-"    -M|--list-models   Visa de tillgängliga skrivarmodellerna.\n"
-"    -h|--help          Visa detta hjälpmeddelande.\n"
-"  Flaggor:\n"
-"    -P|--printer-name  Ange namnet på skrivarkön som ska användas.\n"
-"                       Standardalternativet är standardskrivaren på\n"
-"                       systemet.\n"
-"    -r|--raw-device    Ange namnet på den enhet att skriva till direkt\n"
-"                       istället för att gå via en skrivarkö.\n"
-"    -u|--new           Skrivaren är en ny skrivare (Stylus Color 740 eller\n"
-"                       nyare).\n"
-"    -q|--quiet         Visa inte rubriken.\n"
-"    -S|--short-name    Skriv ut det korta namnet på skrivaren med --"
-"identify.\n"
-"    -m|--model         Ange den exakta skrivarmodellen för justering av\n"
-"                       huvud.\n"
-"    -C|--choices       Ange antalet mönsterval för justering\n"
-"    -p|--patterns      Ange antalet uppsättningar av mönster för justering\n"
 
-#: src/escputil/escputil.c: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"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
 msgstr ""
-"Användning: escputil [FLAGGOR] [KOMMANDO]\n"
-"Användning: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
-"                     [-P skrivare | -r enhet] [-u] [-q] [-m modell] [ -S ]\n"
-"                [-C val] [-p mönster]\n"
-"Utför underhåll på EPSON Stylus®-skrivare.\n"
-"Exempel: escputil -i -r /dev/usb/lp0\n"
-"          escputil -c -u -P MinKö\n"
-"\n"
-"  Kommandon:\n"
-"    -c Rensa utskriftshuvudet.\n"
-"    -n Skriv ut ett mönster för test av munstycken.\n"
-"          Smutsiga eller igentäppta munstycken kommer att visas som\n"
-"          mellanrum i mönstret. Om du ser några mellanrum bör du rensa\n"
-"          utskriftshuvudet.\n"
-"    -a Justera utskriftshuvudet. VARNING: Felaktigt användande av detta\n"
-"          verktyg kan resultera i dålig utskriftskvalitet och/eller skada\n"
-"          på skrivaren.\n"
-"    -s Hämta skrivarstatus.\n"
-"    -i Hämta information om bläcknivån i skrivaren. Detta kräver läs- och\n"
-"          skrivrättigheter till den råa skrivarenheten.\n"
-"    -e Hämta utökade bläckinformationen från skrivaren.\n"
-"          Endast för R800-skrivare och vännter. Detta kräver\n"
-"          läs/skrivåtkomst till den råa skrivarenheten.\n"
-"    -d Undersök skrivaren för information om märke och modell. Detta\n"
-"          kräver läs- och skrivrättigheter till den råa skrivarenheten.\n"
-"    -l Visa licens- och garantivillkoren för detta program.\n"
-"    -M Visa de tillgängliga skrivarmodellerna.\n"
-"    -h Visa detta hjälpmeddelande.\n"
-"  Flaggor:\n"
-"    -P Ange namnet på skrivarkön som ska användas.\n"
-"          Standardalternativet är standardskrivaren på systemet.\n"
-"    -r Ange namnet på den enhet att skriva till direkt istället för att\n"
-"          gå via en skrivarkö.\n"
-"    -u Skrivaren är en ny skrivare (Stylus Color 740 eller nyare).\n"
-"    -q Visa inte rubriken.\n"
-"    -S Skriv ut det korta namnet på skrivaren med -d.\n"
-"    -m Ange den exakta skrivarmodellen för justering av huvud.\n"
-"    -C Ange antalet mönsterval för justering\n"
-"    -p Ange antalet uppsättningar mönster för justering\n"
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
-msgstr "Du kan endast ange en skrivare eller rå enhet."
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
+msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
-msgstr "Du kan endast ange en skrivarmodell."
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
-msgstr "Justeringsval måste vara åtminstone 1."
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
+msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "Okänd flagga %c\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "Användning: %s [FLAGGOR] kommando\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr ""
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
-msgstr "Skriv \"%s --help\" för mer information.\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
+msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
-msgstr "Skriv \"%s -h\" för mer information.\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
+msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "Kan inte öppna enheten %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
-msgstr "Kan inte skriva ut till skrivaren %s med %s\n"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
+msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "Kan inte skicka kommando till skrivare\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
-msgstr "Läsning från skrivaren fick timeout\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
+msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "Kan inte läsa från %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5061
+#, fuzzy
+msgid "Savin 4060"
+msgstr "Canon S400"
 
-#: src/escputil/escputil.c:729
-#, fuzzy, c-format
-msgid "Please specify a raw device\n"
-msgstr "Skrivarstatus kräver att en rå enhet används.\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
+msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
+#: src/xml/xmli18n-tmp.h:5063
+#, fuzzy
+msgid "Savin 4090"
+msgstr "Canon S400"
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "Okänd flagga %s\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "Kan inte skriva till %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5066
+#, fuzzy
+msgid "Savin 8020"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
 msgstr ""
-"\n"
-"Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
-"\n"
-"Kan inte detektera skrivartyp.\n"
-"Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "Okänt"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
+msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
-msgstr "Status: Fel\n"
+#: src/xml/xmli18n-tmp.h:5070
+#, fuzzy
+msgid "Savin 8030"
+msgstr "Canon S800"
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
-msgstr "Status: Upptagen\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
+msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, c-format
-msgid "Status: Waiting\n"
-msgstr "Status: Väntar\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
+msgstr ""
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
-msgstr "Status: Overksam\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
+msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr "Status: Pausad\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
+msgstr ""
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
-msgstr "Status: Rensar\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
+msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr "Status: Stänger ner\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
+msgstr ""
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
-msgstr "Status: Okänt (%d)\n"
+#: src/xml/xmli18n-tmp.h:5079
+#, fuzzy
+msgid "Savin 8065"
+msgstr "Canon BJC-85"
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
-msgstr "Fel: Ödesdigert fel\n"
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
+msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5081
+#, fuzzy
+msgid "Savin 8090"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
-msgstr "Fel: Slut på bläck\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
+msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
-msgstr "Fel: Slut på papper\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
+msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
-msgstr "Fel: Kortläsningsfel\n"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
+msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
-msgstr "Fel: Okänt (%d)\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
+msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
-msgstr "Skriver ut självtest av munstycke\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
-msgstr "Bläcknivåer:\n"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "Bläckfärg"
+#: src/xml/xmli18n-tmp.h:5097
+#, fuzzy
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-161"
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
-msgstr "Återstående procent"
+#: src/xml/xmli18n-tmp.h:5098
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
-msgstr "Varning: Svart bläcknivå är låg\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
+msgstr "Star LS-04"
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
-msgstr "Varning: Okänt (%d)\n"
+#: src/xml/xmli18n-tmp.h:5100
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
-msgstr "Jobbnamn: "
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
+msgstr "Tally MT908"
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
-msgstr "bläcknivåer"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "status"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Få tag på %s kräver att en rå enhet används.\n"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Få tag på bläckinformation kräver att en rå enhet används.\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "Datum"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
-msgstr "Skrivaridentifiering kräver att en rå enhet används.\n"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "Kan inte identifiera skrivarmodellen.\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
-msgstr "Rensar huvuden...\n"
+#: src/xml/xmli18n-tmp.h:5111
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
-"Kör kontroll av munstycken, försäkra dig om att det finns papper i\n"
-"skrivaren.\n"
 
-#: src/escputil/escputil.c:1732
-#, 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 ""
-"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
-"\n"
-"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
-"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
-"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
-"verktygs korrekthet har inte granskats av Seiko Epson, och ingen som helst\n"
-"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
-"dig.\n"
-"\n"
-"Detta verktyg skriver ut %d testmönster. Varje mönster ser väldigt likt ut.\n"
-"Mönstren består av vertikala linjer som överlappar varandra. Under varje\n"
-"linjepar finns ett tal mellan %d och %d.\n"
-"\n"
-"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
-"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
-"linje. Granska paren väldigt noggrannt för att hitta de som passar bäst.\n"
-"Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
-"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
-"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
-"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
-"pappret i pappersfacket innan du anger det.\n"
-"\n"
-"Alla mönster är identiska, men de senare mönstren använder finare punkter\n"
-"för mer kritisk justering. Du måste genomföra alla passen för att justera\n"
-"skrivaren korrekt. Efter det att du har genomfört alla justeringspass\n"
-"kommer justeringsmönstren att skrivas ut en gång till. Du bör då finna att\n"
-"det mittersta paret (%d av %d) är det bästa av alla par.\n"
-"\n"
-"Efter att passen skrivs ut en gång till kommer du att erbjudas alternativen\n"
-"att spara resultaten (s), upprepa proceduren (r), eller avsluta utan att\n"
-"spara (q). Att avsluta kommer inte att återställa de tidigare värdena, men\n"
-"att stänga av och sätta på skrivaren kommer att göra det. Om du avslutar\n"
-"måste du upprepa hela proceduren om du vill spara resultaten senare.\n"
-"Det är viktigt att du inte stänger av din skrivare under denna process.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5113
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1767
-#, 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 ""
-"Läs dessa instruktioner noggrannt innan du fortsätter.\n"
-"\n"
-"Detta verktyg låter dig justera utskriftshuvudet på din Epson\n"
-"Stylus-bläckstråleskrivare. Felaktigt användande av detta verktyg kan göra\n"
-"att utskriftskvaliteten försämras och att din skrivare kanske skadas. Detta\n"
-"verktygs korrekthet har inte granskats av Seiko Epson, och ingen som helst\n"
-"garanti medföljer. Hela ansvaret för användande av detta program vilar på\n"
-"dig.\n"
-"\n"
-"Detta verktyg skriver ut ett testmönster som består av vertikala linjer som\n"
-"överlappar varandra. Under varje linjepar finns ett tal mellan %d och %d.\n"
-"\n"
-"När du granskar linjeparen bör du leta efter de linjepar som är bäst\n"
-"justerade, det vill säga de som tillsammans bäst utgör en enda vertikal\n"
-"justering. Granska paren väldigt noggrannt för att hitta de som passar\n"
-"bäst. Att använda en lupp eller förstoringsglas rekommenderas för den mest\n"
-"kritiska granskningen. Det rekommenderas även att du använder ett bra\n"
-"kvalitetspapper för testet, så att linjerna blir hela och inte sprider ut\n"
-"sig i pappret. Efter det att du har valt det bästa paret lägger du tillbaka\n"
-"pappret i pappersfacket innan du anger det.\n"
-"\n"
-"Efter det att du har kört justeringsmönstret kommer det att skrivas ut en\n"
-"gång till. Du bör då finna att det mittersta paret (%d av %d) är det bästa\n"
-"av alla par.\n"
-"Du kommer då att erbjudas alternativen att spara resultaten (s), upprepa\n"
-"proceduren (r), eller avsluta utan att spara (q). Att avsluta kommer inte\n"
-"att återställa de tidigare värdena, men att stänga av och sätta på\n"
-"skrivaren kommer att göra det.\n"
-"Om du avslutar måste du upprepa hela proceduren om du vill spara resultaten\n"
-"senare. Det är viktigt att du inte stänger av din skrivare under denna\n"
-"process.\n"
-"\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n"
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
-msgstr "Avslutar\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#: src/escputil/escputil.c:1828
-#, 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 ""
-"Kontrollera den slutliga utskriften mycket noggrannt för att försäkra\n"
-"dig om att skrivaren är korrekt justerad. Du kan nu:\n"
-"  (s) Spara resultaten i skrivaren\n"
-"  (q) Avsluta utan att spara resultaten\n"
-"  (r) Upprepa hela förloppet från början\n"
-"Du kommer att få bekräfta ditt val.\n"
-"Vad vill du göra (s, q, r)?\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
+#: src/xml/xmli18n-tmp.h:5118
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1843
-#, 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/xml/xmli18n-tmp.h:5119
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
 
-#: src/escputil/escputil.c:1850
-#, 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 ""
-"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/xml/xmli18n-tmp.h:5120
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
-msgstr ""
-"Bekräfta att du vill upprepa justeringsprocessen genom att\n"
-"ange \"r\" igen:\n"
+#: src/xml/xmli18n-tmp.h:5121
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
-msgstr "Upprepar justeringsprocessen.\n"
+#: src/xml/xmli18n-tmp.h:5122
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
 
-#: src/escputil/escputil.c:1871
-#, 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 ""
-"Detta kommer att permanent ändra din skrivares konfiguration.\n"
-"VARNING: detta förlopp har inte godkänts av Seiko Epson, och kan\n"
-"skada din skrivare. Vill du fortsätta?\n"
-"Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
-"\"s\" igen:\n"
+#: src/xml/xmli18n-tmp.h:5123
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "Kommer att spara inställningar..."
+#: src/xml/xmli18n-tmp.h:5124
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "misslyckades!\n"
+#: src/xml/xmli18n-tmp.h:5125
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
-msgstr ""
-"Dina inställningar sparades inte utan problem. Du måste upprepa\n"
-"justeringsproceduren.\n"
+#: src/xml/xmli18n-tmp.h:5126
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "lyckades!\n"
+#: src/xml/xmli18n-tmp.h:5127
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Dina justeringsinställningar har sparats till skrivaren.\n"
+#: src/xml/xmli18n-tmp.h:5128
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
-msgstr "Okänt kommando.\n"
+#: src/xml/xmli18n-tmp.h:5129
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
-msgstr "Sista kommandot bekräftades inte.\n"
+#: src/xml/xmli18n-tmp.h:5130
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
 
-#: src/escputil/escputil.c:1908
-#, fuzzy, 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 ""
-"Denna procedur förutsätter att din skrivare är en Epson %s.\n"
-"Om detta inte är din skrivarmodell bör du trycka Control+C nu\n"
-"och välja din rätta skrivarmodell.\n"
-"\n"
-"Placera ett pappersark i skrivaren för att påbörja justeringen\n"
-"av huvudena.\n"
+#: src/xml/xmli18n-tmp.h:5131
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "Tryck retur för att fortsätta > "
+#: src/xml/xmli18n-tmp.h:5132
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
 
-#: src/escputil/escputil.c:1984
-#, 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"
+#: src/xml/xmli18n-tmp.h:5133
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:5134
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
+
+#: src/xml/xmli18n-tmp.h:5135
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:5136
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:5137
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/xml/xmli18n-tmp.h:5138
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
+
+#: src/xml/xmli18n-tmp.h:5139
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:5140
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:5141
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:5142
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:5143
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:5144
+#, fuzzy
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/xml/xmli18n-tmp.h:5145
+#, fuzzy
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:5146
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:5147
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
 msgstr ""
-"Granska utskriften och välj det bästa linjeparet i varje mönster.\n"
-"Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
-"proceduren.\n"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "Pass %d"
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Mata in ett nytt pappersark.\n"
+#: src/xml/xmli18n-tmp.h:5150
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "Numret är utanför intervallet!\n"
+#: src/xml/xmli18n-tmp.h:5151
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr "Jag kan inte förstå vad du skrev!\n"
+#: src/xml/xmli18n-tmp.h:5152
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n"
+#: src/xml/xmli18n-tmp.h:5153
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
-msgstr "Försöker ställa in justering..."
+#: src/xml/xmli18n-tmp.h:5154
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "lyckades.\n"
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
 
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
 msgstr ""
-"Verifiera att justeringen är korrekt. Efter det att justeringsmönstret\n"
-"skrivits ut igen bör du försäkra dig om att det bästa mönstret för varje\n"
-"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:2092
-#, c-format
-msgid "Error in input\n"
-msgstr "Fel i indata\n"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
+msgstr "RÃ… DATA 16-bitar"
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "Skriver ut..."
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
+msgstr "RÃ… DATA 8-bitar"
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISOLatin1"
+
+#~ msgid "Three Level Grayscale"
+#~ msgstr "Trenivåers gråton"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Sjufärgs förbättrad"
+
+#~ msgid "720 x 720 DPI"
+#~ msgstr "720 × 720 DPI"
+
+#~ msgid "ISO A4"
+#~ msgstr "ISO A4"
+
+#~ msgid "ISO A5"
+#~ msgstr "ISO A5"
 
 #~ msgid "90x90 DPI"
 #~ msgstr "90×90 DPI"
@@ -8432,9 +12653,6 @@ msgstr "Skriver ut..."
 #~ msgid "High Gloss Film"
 #~ msgstr "Högglansig film"
 
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "Glansigt fotopapper"
-
 #~ msgid "Glossy Photo Cards"
 #~ msgstr "Glansiga fotokort"
 
@@ -8457,9 +12675,6 @@ msgstr "Skriver ut..."
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK-färg"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY-färg"
-
 #~ msgid " Gamma"
 #~ msgstr " Gamma"
 
@@ -9200,9 +13415,6 @@ msgstr "Skriver ut..."
 #~ msgid "Type of media you're printing to"
 #~ msgstr "Typ av media som du skriver ut till"
 
-#~ msgid "Media Size:"
-#~ msgstr "Mediastorlek:"
-
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "Storlek på pappret som du vill skriva ut till"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 82284a4..d9e8843 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 257b578..c629105 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0-b5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 21:19-0400\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-10-19 15:39-0400\n"
 "PO-Revision-Date: 2005-08-07 12:56+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2116
+#: src/main/print-escp2.c:2081 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "�設"
 
@@ -89,18 +89,19 @@ msgstr ""
 msgid "Density"
 msgstr "密度"
 
-#: src/main/dither-main.c:91 src/main/print-canon.c:295
-#: src/main/print-canon.c:303 src/main/print-canon.c:311
-#: src/main/print-canon.c:319 src/main/print-escp2.c:446
-#: src/main/print-escp2.c:454 src/main/print-escp2.c:462
-#: src/main/print-escp2.c:470 src/main/print-escp2.c:478
-#: src/main/print-escp2.c:486 src/main/print-escp2.c:494
-#: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
-#: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770
-#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786
-#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337
-#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353
+#: src/main/dither-main.c:91 src/main/print-canon.c:301
+#: src/main/print-canon.c:309 src/main/print-canon.c:317
+#: src/main/print-canon.c:325 src/main/print-escp2.c:439
+#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
+#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
+#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
+#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-lexmark.c:333 src/main/print-lexmark.c:341
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1769
+#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
+#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -155,9 +156,9 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "擬色�算方�"
 
-#: src/main/print-canon.c:200 src/main/print-escp2.c:182
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697
-#: src/main/print-pcl.c:1264
+#: src/main/print-canon.c:200 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "��尺寸"
 
@@ -165,302 +166,347 @@ msgstr "��尺寸"
 #: src/main/print-canon.c:212 src/main/print-canon.c:218
 #: src/main/print-canon.c:224 src/main/print-canon.c:230
 #: src/main/print-canon.c:248 src/main/print-canon.c:272
-#: src/main/print-escp2.c:182 src/main/print-escp2.c:188
-#: src/main/print-escp2.c:194 src/main/print-escp2.c:200
-#: src/main/print-escp2.c:206 src/main/print-escp2.c:212
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:247
-#: src/main/print-escp2.c:253 src/main/print-escp2.c:265
-#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697
-#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709
-#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264
-#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276
-#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68
-#: src/main/print-ps.c:74
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
+#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
+#: src/main/print-escp2.c:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1704 src/main/print-olympus.c:1710
+#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Basic Printer Setup"
 msgstr "基本�表機設定"
 
-#: src/main/print-canon.c:201 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698
-#: src/main/print-pcl.c:1265
+#: src/main/print-canon.c:201 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "列�時使用的紙張尺寸"
 
-#: src/main/print-canon.c:206 src/main/print-escp2.c:188
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703
-#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422
+#: src/main/print-canon.c:206 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1331 src/cups/genppd.c:1996
 msgid "Media Type"
 msgstr "紙張類別"
 
-#: src/main/print-canon.c:207 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704
-#: src/main/print-pcl.c:1271
+#: src/main/print-canon.c:207 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "紙張的類別 (普通紙�相紙等等)"
 
-#: src/main/print-canon.c:212 src/main/print-escp2.c:194
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709
-#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450
+#: src/main/print-canon.c:212 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1360 src/cups/genppd.c:2015
 msgid "Media Source"
 msgstr "紙張來�"
 
-#: src/main/print-canon.c:213 src/main/print-escp2.c:195
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1277
+#: src/main/print-canon.c:213 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "�紙匣或者紙張的來�"
 
-#: src/main/print-canon.c:218 src/main/print-escp2.c:200
+#: src/main/print-canon.c:218 src/main/print-escp2.c:189
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:219 src/main/print-escp2.c:201
+#: src/main/print-canon.c:219 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:224 src/main/print-escp2.c:206
+#: src/main/print-canon.c:224 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:225 src/main/print-escp2.c:207
+#: src/main/print-canon.c:225 src/main/print-escp2.c:196
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:230 src/main/print-escp2.c:212
+#: src/main/print-canon.c:230 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:231 src/main/print-escp2.c:213
+#: src/main/print-canon.c:231 src/main/print-escp2.c:202
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
 
-#: src/main/print-canon.c:236 src/main/print-escp2.c:218
+#: src/main/print-canon.c:236 src/main/print-escp2.c:207
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
-#: src/main/print-canon.c:254 src/main/print-escp2.c:218
-#: src/main/print-escp2.c:224 src/main/print-escp2.c:241
-#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727
-#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288
-#: src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "進階�表機設定"
 
 #: src/main/print-canon.c:237 src/main/print-canon.c:243
-#: src/main/print-escp2.c:219 src/main/print-escp2.c:225
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:242 src/main/print-escp2.c:224
+#: src/main/print-canon.c:242 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:248 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715
-#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523
+#: src/main/print-canon.c:248 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1438 src/cups/genppd.c:2051
 msgid "Resolution"
 msgstr "解�度"
 
 #: src/main/print-canon.c:249 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283
+#: src/main/print-olympus.c:1723
 msgid "Resolution and quality of the print"
 msgstr "列�時的解�度��質"
 
-#: src/main/print-canon.c:254 src/main/print-escp2.c:241
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721
-#: src/main/print-pcl.c:1288 src/main/print-raw.c:80
+#: src/main/print-canon.c:254 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "墨水類別"
 
-#: src/main/print-canon.c:255 src/main/print-escp2.c:242
-#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289
+#: src/main/print-canon.c:255 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "�表機墨水的類型"
 
 #: src/main/print-canon.c:260 src/main/print-canon.c:261
-#: src/main/print-escp2.c:331 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:260 src/main/print-escp2.c:132
-#: src/main/print-escp2.c:139 src/main/print-escp2.c:146
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:295
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:307
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:319
-#: src/main/print-escp2.c:325 src/main/print-escp2.c:331
-#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296
-#: src/main/print-pcl.c:1294
+#: src/main/print-canon.c:260 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:767
+#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
+#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
+#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
+#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "進階�表機功能"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:343
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739
-#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-canon.c:266 src/main/print-escp2.c:326
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "列�模�"
 
 #: src/main/print-canon.c:266 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:343
-#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300
-#: src/main/print-ps.c:80 src/main/print-raw.c:86
+#: src/main/print-color.c:208 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:267 src/main/print-escp2.c:344
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740
-#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87
+#: src/main/print-canon.c:267 src/main/print-escp2.c:327
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:272 src/main/print-pcl.c:1306
+#: src/main/print-canon.c:272 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
 msgid "Double-Sided Printing"
 msgstr "雙�列�"
 
-#: src/main/print-canon.c:273 src/main/print-pcl.c:1307
+#: src/main/print-canon.c:273 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:295 src/main/print-escp2.c:446
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329
+#: src/main/print-canon.c:278 src/main/print-canon.c:279
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "列��質"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:439
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "氰�色密度"
 
-#: src/main/print-canon.c:296 src/main/print-escp2.c:447
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330
+#: src/main/print-canon.c:302 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "調整氰�色色彩密度"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337
+#: src/main/print-canon.c:309 src/main/print-escp2.c:447
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338
+#: src/main/print-canon.c:310 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345
+#: src/main/print-canon.c:317 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346
+#: src/main/print-canon.c:318 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353
+#: src/main/print-canon.c:325 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354
+#: src/main/print-canon.c:326 src/main/print-escp2.c:464
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:328
-#: src/main/print-escp2.c:534 src/main/print-escp2.c:535
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-canon.c:335
-#: src/main/print-canon.c:343 src/main/print-escp2.c:502
-#: src/main/print-escp2.c:510 src/main/print-escp2.c:518
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:534
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:550
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:566
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:582
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:598
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:614
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:630
-#: src/main/print-escp2.c:638 src/main/print-escp2.c:646
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:662
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:678
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:694
-#: src/main/print-escp2.c:702 src/main/print-escp2.c:710
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:726
-#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361
-#: src/main/print-pcl.c:1369
+#: src/main/print-canon.c:333 src/main/print-canon.c:341
+#: src/main/print-canon.c:349 src/main/print-escp2.c:503
+#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
+#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
+#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
+#: src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
-#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
+#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:349 src/main/print-canon.c:350
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:363 src/main/print-pcl.c:1550
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
-#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2255
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3534
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:364 src/main/print-pcl.c:1551
+#: src/main/print-canon.c:370 src/main/print-escp2.c:2257
+#: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:365 src/main/print-pcl.c:1552
+#: src/main/print-canon.c:371 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:629 src/main/print-escp2.c:2012
-#: src/main/xmli18n-tmp.h:6
+#: src/main/print-canon.c:647 src/main/print-escp2.c:1977
+#: src/xml/xmli18n-tmp.h:3583
 msgid "CD - 5 inch"
 msgstr "5 �光碟"
 
-#: src/main/print-canon.c:631 src/main/print-escp2.c:2014
-#: src/main/xmli18n-tmp.h:7
+#: src/main/print-canon.c:649 src/main/print-escp2.c:1979
+#: src/xml/xmli18n-tmp.h:3584
 msgid "CD - 3 inch"
 msgstr "3 �光碟"
 
-#: src/main/print-canon.c:633 src/main/print-escp2.c:2016
-#: src/main/xmli18n-tmp.h:8
+#: src/main/print-canon.c:651 src/main/print-escp2.c:1981
+#: src/xml/xmli18n-tmp.h:3585
 #, fuzzy
 msgid "CD - Custom"
 msgstr "自�"
 
-#: src/main/print-canon.c:656 src/main/print-escp2.c:2041
+#: src/main/print-canon.c:674 src/main/print-escp2.c:2006
+#: src/cups/genppd.c:1315 src/cups/genppd.c:1564 src/cups/genppd.c:1983
+#: src/cups/genppd.c:2074
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:658 src/main/print-escp2.c:2043
+#: src/main/print-canon.c:676 src/main/print-escp2.c:2008
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:773 src/main/print-escp2.c:2450
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994
-#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135
-#: src/gutenprintui2/panel.c:290
+#: src/main/print-canon.c:791 src/main/print-escp2.c:2419
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:775 src/main/print-escp2.c:2452
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846
-#: src/main/print-ps.c:312 src/main/print-raw.c:137
+#: src/main/print-canon.c:793 src/main/print-escp2.c:2421
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "黑白"
 
+#: src/main/print-canon.c:832 src/main/print-escp2.c:2061
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr ""
+
+#: src/main/print-canon.c:834 src/main/print-escp2.c:2103
+#: src/main/print-escp2.c:2201 src/main/print-escp2.c:2213
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
+#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3092 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3368
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3539
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3572
+msgid "Standard"
+msgstr "標準"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -493,9 +539,8 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:916
-#: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943
-#: src/gutenprintui2/panel.c:291
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1260 src/cups/genppd.c:1966
 msgid "Grayscale"
 msgstr "�階"
 
@@ -511,11 +556,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129
+#: src/main/print-color.c:129 src/cups/genppd.c:1291 src/cups/genppd.c:1973
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131
+#: src/main/print-color.c:131 src/cups/genppd.c:1298 src/cups/genppd.c:1974
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -575,7 +620,7 @@ msgid "Output image type"
 msgstr "輸出影�類型"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:349
+#: src/main/print-escp2.c:332
 msgid "Raw Channels"
 msgstr ""
 
@@ -636,16 +681,56 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr "程�使用的 Gamma 值"
 
-#: src/main/print-color.c:266 src/main/escp2-channels.c:3087
-#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107
-#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128
-#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156
-#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177
-#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204
-#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230
-#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328
-#: src/escputil/escputil.c:978 src/escputil/escputil.c:997
-#: src/escputil/escputil.c:1201
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:978 src/escputil/escputil.c:998
+#: src/escputil/escputil.c:1264 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1802
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1884
+#: src/xml/xmli18n-tmp.h:1900 src/xml/xmli18n-tmp.h:1915
+#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:1993
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2017
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2309
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2346 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2462
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2515
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2540
+#: src/xml/xmli18n-tmp.h:2552 src/xml/xmli18n-tmp.h:2564
+#: src/xml/xmli18n-tmp.h:2576 src/xml/xmli18n-tmp.h:2589
+#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2619
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2663 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2769
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2950 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:2998
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3059
 msgid "Cyan"
 msgstr "æ°°è—�"
 
@@ -653,16 +738,56 @@ msgstr "æ°°è—�"
 msgid "Adjust the cyan gamma"
 msgstr "調整氰�色 gamma 值"
 
-#: src/main/print-color.c:274 src/main/escp2-channels.c:3088
-#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109
-#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129
-#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155
-#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178
-#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203
-#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229
-#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335
-#: src/escputil/escputil.c:979 src/escputil/escputil.c:998
-#: src/escputil/escputil.c:1202
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:979 src/escputil/escputil.c:999
+#: src/escputil/escputil.c:1265 src/xml/xmli18n-tmp.h:1779
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1803
+#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1885
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2031 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2310
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2463
+#: src/xml/xmli18n-tmp.h:2476 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2553 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2590
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2618
+#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2650
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2770
+#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2821
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2971
+#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:2999
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3060
 msgid "Magenta"
 msgstr "æ´‹ç´…"
 
@@ -670,16 +795,56 @@ msgstr "æ´‹ç´…"
 msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
-#: src/main/print-color.c:282 src/main/escp2-channels.c:3089
-#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108
-#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130
-#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151
-#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179
-#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202
-#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228
-#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342
-#: src/escputil/escputil.c:980 src/escputil/escputil.c:999
-#: src/escputil/escputil.c:1203
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:980 src/escputil/escputil.c:1000
+#: src/escputil/escputil.c:1266 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1857
+#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1930 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2178
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2258
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2529 src/xml/xmli18n-tmp.h:2542
+#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2617
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2745
+#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2822
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2972
+#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3061
 msgid "Yellow"
 msgstr "黃"
 
@@ -687,9 +852,11 @@ msgstr "黃"
 msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
-#: src/main/print-color.c:290 src/main/escp2-channels.c:3207
-#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1006
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:3012
 msgid "Red"
 msgstr "ç´…"
 
@@ -697,7 +864,7 @@ msgstr "ç´…"
 msgid "Adjust the red gamma"
 msgstr "調整紅色 gamma 值"
 
-#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
 msgstr "綠"
 
@@ -705,9 +872,10 @@ msgstr "綠"
 msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
-#: src/main/print-color.c:306 src/main/escp2-channels.c:3208
-#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1007
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2667
+#: src/xml/xmli18n-tmp.h:2685 src/xml/xmli18n-tmp.h:2762
 msgid "Blue"
 msgstr "è—�"
 
@@ -716,16 +884,54 @@ msgid "Adjust the blue gamma"
 msgstr "調整�色 gamma 值"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
-#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096
-#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110
-#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127
-#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152
-#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176
-#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195
-#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231
-#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349
-#: src/escputil/escputil.c:975 src/escputil/escputil.c:996
-#: src/escputil/escputil.c:1200
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:975
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1263
+#: src/xml/xmli18n-tmp.h:1777 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1828 src/xml/xmli18n-tmp.h:1841
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1867
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:1940 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:2004
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2029
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2175 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2201 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2240
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2270
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2297
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2487
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2514
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2539
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2563
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2588
+#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2805
+#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2908 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2949 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:2997
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3062
 msgid "Black"
 msgstr "黑"
 
@@ -733,7 +939,7 @@ msgstr "黑"
 msgid "Adjust the black gamma"
 msgstr "調整黑色 gamma 值"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1762
+#: src/main/print-color.c:322 src/main/print-olympus.c:1769
 msgid "Cyan Balance"
 msgstr "氰�色平衡"
 
@@ -746,7 +952,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1770
+#: src/main/print-color.c:330 src/main/print-olympus.c:1777
 msgid "Magenta Balance"
 msgstr "洋紅色平衡"
 
@@ -754,7 +960,7 @@ msgstr "洋紅色平衡"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1778
+#: src/main/print-color.c:338 src/main/print-olympus.c:1785
 msgid "Yellow Balance"
 msgstr "黃色平衡"
 
@@ -781,10 +987,11 @@ msgstr ""
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:355 src/main/print-escp2.c:361
-#: src/main/print-escp2.c:367 src/main/print-escp2.c:373
-#: src/main/print-escp2.c:379 src/main/print-escp2.c:742
-#: src/main/print-escp2.c:750 src/main/print-escp2.c:758
+#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
+#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
+#: src/main/print-escp2.c:759
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -792,27 +999,27 @@ msgstr ""
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:742
+#: src/main/print-color.c:365 src/main/print-escp2.c:743
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:743
+#: src/main/print-color.c:366 src/main/print-escp2.c:744
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:750
+#: src/main/print-color.c:373 src/main/print-escp2.c:751
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:751
+#: src/main/print-color.c:374 src/main/print-escp2.c:752
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:758
+#: src/main/print-color.c:381 src/main/print-escp2.c:759
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:759
+#: src/main/print-color.c:382 src/main/print-escp2.c:760
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -941,463 +1148,528 @@ msgstr ""
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:514
+#: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:527 src/main/printers.c:532
+#: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:551
+#: src/main/printers.c:586
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s 必須在 %f 和 %f 之間 (實際上是 %f)\n"
 
-#: src/main/printers.c:573 src/main/printers.c:597
+#: src/main/printers.c:608 src/main/printers.c:632
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s 必須在 %d 和 %d 之間 (實際上是 %d)\n"
 
-#: src/main/printers.c:628
+#: src/main/printers.c:663
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s 必須在 %f 和 %f 之間\n"
 
-#: src/main/printers.c:636
+#: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:640
+#: src/main/printers.c:675
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:684
+#: src/main/printers.c:719
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:697 src/main/printers.c:708
+#: src/main/printers.c:732 src/main/printers.c:743
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:768
+#: src/main/printers.c:803
 msgid "Page size is not valid\n"
 msgstr "��尺寸無效\n"
 
-#: src/main/printers.c:789
+#: src/main/printers.c:824
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "頂部邊框寬度必須�少於 %d\n"
 
-#: src/main/printers.c:795
+#: src/main/printers.c:830
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "左邊邊框寬度必須�少於 %d\n"
 
-#: src/main/printers.c:801
+#: src/main/printers.c:836
 msgid "Height must be greater than zero\n"
 msgstr "高度必須大於零\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:842
 msgid "Width must be greater than zero\n"
 msgstr "寬度必須大於零\n"
 
-#: src/main/printers.c:813
+#: src/main/printers.c:848
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:820
+#: src/main/printers.c:855
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:164
+#: src/main/print-escp2.c:147
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:164 src/main/print-escp2.c:176
-#: src/main/generic-options.c:62
-msgid "Basic Output Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:165
+#: src/main/print-escp2.c:148
 msgid "Automatic printing mode"
 msgstr "自動列�模�"
 
-#: src/main/print-escp2.c:176 src/main/print-escp2.c:177
-#: src/main/generic-options.c:62 src/main/generic-options.c:63
-msgid "Print Quality"
-msgstr "列��質"
-
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
 msgid "Resolution of the print"
 msgstr "列�時的解�度"
 
-#: src/main/print-escp2.c:247
+#: src/main/print-escp2.c:236
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:248
+#: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:253
+#: src/main/print-escp2.c:242
 msgid "Ink Set"
 msgstr ""
 
-#: src/main/print-escp2.c:259
+#: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "列�方�"
 
-#: src/main/print-escp2.c:259 src/main/print-escp2.c:271
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:271
+#: src/main/print-escp2.c:260
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:272
+#: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:277
-msgid "Adjust dot size as necessary"
-msgstr ""
-
-#: src/main/print-escp2.c:278
-msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
-
-#: src/main/print-escp2.c:283 src/main/print-escp2.c:284
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1559 src/cups/genppd.c:2073
 msgid "Output Order"
 msgstr ""
 
-#: src/main/print-escp2.c:289 src/main/print-escp2.c:290
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:295 src/main/print-escp2.c:296
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:301 src/main/print-escp2.c:302
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:307 src/main/print-escp2.c:308
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:313 src/main/print-escp2.c:314
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:319
+#: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:320
+#: src/main/print-escp2.c:303
 msgid "Supports D4 Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:325
+#: src/main/print-escp2.c:308
 msgid "Has Interchangeable Ink Cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:309
 msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
-#: src/main/print-escp2.c:337 src/main/print-escp2.c:338
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:333
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:355
+#: src/main/print-escp2.c:338
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:339
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:361
+#: src/main/print-escp2.c:344
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:345
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:367
+#: src/main/print-escp2.c:350
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:351
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:373
+#: src/main/print-escp2.c:356
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:374
+#: src/main/print-escp2.c:357
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:379
+#: src/main/print-escp2.c:362
+msgid "Orange Map"
+msgstr ""
+
+#: src/main/print-escp2.c:363
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "調整紅色 gamma 值"
+
+#: src/main/print-escp2.c:368
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:380
+#: src/main/print-escp2.c:369
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:478
+#: src/main/print-escp2.c:471
 msgid "Red Density"
 msgstr "紅色密度"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:472
 msgid "Adjust the red density"
 msgstr "調整紅色色彩密度"
 
-#: src/main/print-escp2.c:486
+#: src/main/print-escp2.c:479
 msgid "Blue Density"
 msgstr "�色密度"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:480
 msgid "Adjust the blue density"
 msgstr "調整�色色彩密度"
 
-#: src/main/print-escp2.c:494
+#: src/main/print-escp2.c:487
+#, fuzzy
+msgid "Orange Density"
+msgstr "氰�色密度"
+
+#: src/main/print-escp2.c:488
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "調整紅色色彩密度"
+
+#: src/main/print-escp2.c:495
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:496
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:502
+#: src/main/print-escp2.c:503
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:504
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:510
+#: src/main/print-escp2.c:511
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:512
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:518
+#: src/main/print-escp2.c:519
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:520
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:526 src/main/print-escp2.c:527
+#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
 msgid "Light Cyan Value"
 msgstr ""
 
-#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "氰�色密度"
 
-#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "洋紅色平衡"
 
-#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "洋紅色密度"
 
-#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "黃色平衡"
 
-#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "黃色密度"
 
-#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
+#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
 #, fuzzy
 msgid "Gray Value"
 msgstr "�階"
 
-#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
-#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
+#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
 msgid "Gray Transition"
 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
+#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
+#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "�階"
 
-#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:718 src/main/print-escp2.c:719
+#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
+#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
 msgid "Light Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
-#: src/main/print-escp2.c:726 src/main/print-escp2.c:727
+#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
+#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
 msgid "Light Gray Transition"
 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
+#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
+#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
 msgid "Light Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
 msgid "Dark Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
 msgid "Dark Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:694
+#: src/main/print-escp2.c:695
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "�階"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:696
 msgid "Medium Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:702
+#: src/main/print-escp2.c:703
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:704
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:710
+#: src/main/print-escp2.c:711
 msgid "Mid Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:712
 msgid "Medium Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:1999
-msgid "Full Manual Control"
+#: src/main/print-escp2.c:767
+msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:2001
-msgid "Automatic Setting Control"
+#: src/main/print-escp2.c:768
+msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:2096 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
+#: src/main/print-escp2.c:775
+msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231
-#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237
-#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836
-#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742
-#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826
-#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910
-#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640
-#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670
-#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36
-#: src/gutenprintui2/panel.c:2814
-msgid "Standard"
-msgstr "標準"
+#: src/main/print-escp2.c:776
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:783
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:784
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:799
+#, fuzzy
+msgid "Paper Thickness"
+msgstr "紙張尺寸"
+
+#: src/main/print-escp2.c:800
+msgid "Set printer paper thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:807
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "黑色密度"
+
+#: src/main/print-escp2.c:808
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:815
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:816
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:823
+#, fuzzy
+msgid "Print Method"
+msgstr "列�模�"
+
+#: src/main/print-escp2.c:824
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:831
+#, fuzzy
+msgid "Platen Gap"
+msgstr "普通紙張"
+
+#: src/main/print-escp2.c:832
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:839
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:840
+#, c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:1964
+msgid "Full Manual Control"
+msgstr ""
+
+#: src/main/print-escp2.c:1966
+msgid "Automatic Setting Control"
+msgstr ""
+
+#: src/main/print-escp2.c:2180 src/cups/genppd.c:1476 src/cups/genppd.c:2054
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2182
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2214
+#: src/main/print-escp2.c:2184
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2215
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2217
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2219
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2221
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2253
+#: src/main/print-escp2.c:2223
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2771
+#: src/main/print-escp2.c:2259
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:2821
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449
-#: src/main/print-raw.c:217
+#: src/main/print-escp2.c:4070 src/main/print-olympus.c:2472
+#: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
 
@@ -1450,136 +1722,363 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302
-#: src/main/escp2-channels.c:1316 src/main/escp2-channels.c:1330
-#: src/main/escp2-channels.c:1354 src/main/escp2-channels.c:1368
-#: src/main/escp2-channels.c:1382 src/main/escp2-channels.c:1396
-#: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424
-#: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3174
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3195
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3379 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3428 src/xml/xmli18n-tmp.h:3443
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3511
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138
-#: src/main/escp2-channels.c:1152 src/main/escp2-channels.c:1166
-#: src/main/escp2-channels.c:1180 src/main/escp2-channels.c:1194
-#: src/main/escp2-channels.c:1208 src/main/escp2-channels.c:1232
-#: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252
-#: src/main/escp2-channels.c:1266
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3119
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3141 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3203
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3223
+#: src/xml/xmli18n-tmp.h:3235 src/xml/xmli18n-tmp.h:3247
+#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3276
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3308
+#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3500 src/xml/xmli18n-tmp.h:3506
+#: src/xml/xmli18n-tmp.h:3512
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568
-#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596
-#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837
-#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3181
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3220
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3317
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3372
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3486
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
-#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781
-#: src/main/escp2-channels.c:1798
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3221
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3245
+#: src/xml/xmli18n-tmp.h:3259 src/xml/xmli18n-tmp.h:3274
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3360 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3487
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351
-#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439
-#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535
-#: src/main/escp2-papers.c:1579
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:929 src/xml/xmli18n-tmp.h:986
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1100
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1243 src/xml/xmli18n-tmp.h:1300
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1468 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1642
+#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1739
 msgid "Plain Paper"
 msgstr "普通紙張"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357
-#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445
-#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541
-#: src/main/escp2-papers.c:1585
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:995
+#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1104
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1351 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1651
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1745
 msgid "Glossy Film"
 msgstr "光�膠片"
 
-#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359
-#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447
-#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543
-#: src/main/escp2-papers.c:1587
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:827 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:941 src/xml/xmli18n-tmp.h:998
+#: src/xml/xmli18n-tmp.h:1055 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1198
+#: src/xml/xmli18n-tmp.h:1255 src/xml/xmli18n-tmp.h:1308
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1597 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1747
 msgid "Transparencies"
 msgstr "�明膠片"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361
-#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449
-#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545
-#: src/main/escp2-papers.c:1589
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1258
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1657 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1749
 msgid "Envelopes"
 msgstr "ä¿¡å°�"
 
 # (Abel) from fuji, epson
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365
-#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453
-#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549
-#: src/main/escp2-papers.c:1593
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1264
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1486
+#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1606
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1753
 msgid "Matte Paper"
 msgstr "雪�銅版紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369
-#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457
-#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553
-#: src/main/escp2-papers.c:1597
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1270
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1757
 msgid "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371
-#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459
-#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555
-#: src/main/escp2-papers.c:1599
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1615
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1723
+#: src/xml/xmli18n-tmp.h:1759
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373
-#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461
-#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557
-#: src/main/escp2-papers.c:1601
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1219 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:1618
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1761
 msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375
-#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463
-#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559
-#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1678 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1763
 msgid "Premium Glossy Photo Paper"
 msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379
-#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
-#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563
-#: src/main/escp2-papers.c:1607
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:971
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1126 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1627
+#: src/xml/xmli18n-tmp.h:1684 src/xml/xmli18n-tmp.h:1731
+#: src/xml/xmli18n-tmp.h:1767
 msgid "Premium Luster Photo Paper"
 msgstr "精�光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381
-#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473
-#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565
-#: src/main/escp2-papers.c:1613
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1288
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1573 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1769
 msgid "Photo Quality Glossy Paper"
 msgstr "光�紙"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383
-#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475
-#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567
-#: src/main/escp2-papers.c:1615
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:977
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1091
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1291
+#: src/xml/xmli18n-tmp.h:1336 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1633
+#: src/xml/xmli18n-tmp.h:1696 src/xml/xmli18n-tmp.h:1771
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387
-#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479
-#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571
-#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:983
+#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1097
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1184
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1402
+#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1639
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1775
 msgid "Other"
 msgstr "其它"
 
@@ -1595,170 +2094,193 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:275
+#: src/main/print-olympus.c:279
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759
-#: src/cups/genppd.c:1840
+#: src/main/print-olympus.c:280 src/cups/genppd.c:1677 src/cups/genppd.c:1705
+#: src/cups/genppd.c:1737 src/cups/genppd.c:1792 src/cups/genppd.c:1841
+#: src/cups/genppd.c:2142 src/cups/genppd.c:2155 src/cups/genppd.c:2178
+#: src/cups/genppd.c:2199 src/cups/genppd.c:2221
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021
-#: src/main/print-olympus.c:1125
+#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
+#: src/main/print-olympus.c:1132
 msgid "Glossy"
 msgstr "光�"
 
-#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022
-#: src/main/print-olympus.c:1126
+#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
+#: src/main/print-olympus.c:1133
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127
+#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728
+#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1763
+#: src/main/print-olympus.c:1770
 msgid "Adjust the cyan balance"
 msgstr "調整氰�色色彩平衡"
 
-#: src/main/print-olympus.c:1771
+#: src/main/print-olympus.c:1778
 msgid "Adjust the magenta balance"
 msgstr "調整洋紅色色彩平衡"
 
-#: src/main/print-olympus.c:1779
+#: src/main/print-olympus.c:1786
 msgid "Adjust the yellow balance"
 msgstr "調整黃色色彩平衡"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1793
 msgid "Black Balance"
 msgstr "黑色平衡"
 
-#: src/main/print-olympus.c:1787
+#: src/main/print-olympus.c:1794
 msgid "Adjust the black balance"
 msgstr "調整黑色色彩平衡"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:184
 msgid "Plain"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:185
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:186
 msgid "Premium"
 msgstr "é ‚ç´š"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:187
 msgid "Glossy Photo"
 msgstr "光�相紙"
 
-#: src/main/print-pcl.c:189
+#: src/main/print-pcl.c:188
 msgid "Transparency"
 msgstr "�明度"
 
-#: src/main/print-pcl.c:190
+#: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:191
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3594
 msgid "Manual"
 msgstr "自�"
 
-#: src/main/print-pcl.c:240
+#: src/main/print-pcl.c:239
 msgid "Tray 1 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:241
+#: src/main/print-pcl.c:240
 msgid "Tray 1"
 msgstr ""
 
-#: src/main/print-pcl.c:242
+#: src/main/print-pcl.c:241
 msgid "Tray 2 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:243 src/main/print-pcl.c:251
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
 msgid "Tray 2"
 msgstr ""
 
-#: src/main/print-pcl.c:244
+#: src/main/print-pcl.c:243
 msgid "Tray 3 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:245
+#: src/main/print-pcl.c:244
 msgid "Tray 3"
 msgstr ""
 
-#: src/main/print-pcl.c:246
+#: src/main/print-pcl.c:245
 msgid "Tray 4 - Movable Guides"
 msgstr ""
 
-#: src/main/print-pcl.c:247
+#: src/main/print-pcl.c:246
 msgid "Tray 4"
 msgstr ""
 
-#: src/main/print-pcl.c:248
+#: src/main/print-pcl.c:247
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:249
+#: src/main/print-pcl.c:248
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:250
+#: src/main/print-pcl.c:249
 msgid "Tray"
 msgstr ""
 
-#: src/main/print-pcl.c:252
+#: src/main/print-pcl.c:251
 msgid "Optional Source"
 msgstr ""
 
-#: src/main/print-pcl.c:253
+#: src/main/print-pcl.c:252
 msgid "Autoselect"
 msgstr "自動�擇"
 
-#: src/main/print-pcl.c:267
+#: src/main/print-pcl.c:266
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-pcl.c:268
+#: src/main/print-pcl.c:267
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-pcl.c:269
+#: src/main/print-pcl.c:268
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-pcl.c:270
+#: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI 單色"
 
-#: src/main/print-pcl.c:271
+#: src/main/print-pcl.c:270
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-pcl.c:272
+#: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-pcl.c:273
+#: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1538
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3554 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3571
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3565
+#: src/xml/xmli18n-tmp.h:3573
+msgid "High"
+msgstr ""
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3574
+msgid "Photo"
+msgstr "相片"
+
+#: src/main/print-pcl.c:1578
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1539
+#: src/main/print-pcl.c:1579
 msgid "Color + Photo Cartridges"
 msgstr ""
 
@@ -1767,6717 +2289,10268 @@ msgstr ""
 msgid "PPDFile"
 msgstr "PPD 檔"
 
-#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 msgid "PPD File"
 msgstr "PPD 檔"
 
-#: src/main/print-ps.c:74
+#: src/main/print-ps.c:80
 msgid "Model Name"
 msgstr ""
 
-#: src/main/print-ps.c:75
+#: src/main/print-ps.c:81
 msgid "PPD File Model Name"
 msgstr ""
 
-#: src/main/print-raw.c:223
+#: 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:3578
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3615
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3730
+msgid "Custom"
+msgstr "自�"
+
+#: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-msgid "Two Level Grayscale"
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3561
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3537
+#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3570
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3549 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+msgid "Super Photo"
+msgstr ""
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3559
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3576
+msgid "Ultra Photo"
+msgstr ""
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1318 src/cups/genppd.c:1984
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:3577
+msgid "Best"
+msgstr ""
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr ""
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr ""
+
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "相片"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr ""
+
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr ""
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr ""
+
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr ""
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr ""
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
+
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr ""
+
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "X 下�"
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "X 上�"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Y 下�"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Y 上�"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
 msgstr ""
 
-#: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "_Gamma 值"
+
+#: 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 "以鉛點 (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
 #, fuzzy
-msgid "Three Level Grayscale"
-msgstr "�階"
+msgid "Select File..."
+msgstr "設定�表機..."
 
-#: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048
-#: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074
-#: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100
-#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548
-#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588
-#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628
-msgid "Quadtone"
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
 msgstr ""
 
-#: src/main/escp2-channels.c:1466
-msgid "Four Color Photo"
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- 列�增效模組 %s 版本"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "關於"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
 msgstr ""
+"列�並\n"
+"儲存設定"
 
-#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632
-msgid "Six Color Enhanced Composite"
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
 msgstr ""
+"儲存\n"
+"設定"
 
-#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719
-msgid "Seven Color Photo"
+#: 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/main/escp2-channels.c:1705
-msgid "Seven Color Enhanced"
+#: 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/main/escp2-channels.c:1742
-msgid "Eight Color Photo"
+#: 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:1716
+msgid "Both"
+msgstr "兩者"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "將影�放置在紙張中間"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "åž‚ç›´"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "將影�的垂直�置調整至紙張中間"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "設定�表機"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
 msgstr ""
 
-#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902
-#: src/main/escp2-channels.c:1908
-msgid "One Color Raw"
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
 msgstr ""
 
-#: src/main/escp2-channels.c:1914
-msgid "One Color Raw Enhanced Gloss"
+#: 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/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939
-msgid "Two Color Raw"
+#: 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/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967
-#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007
-#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033
-#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061
-#: src/main/escp2-channels.c:2074
-msgid "Three Color Raw"
+#: 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/main/escp2-channels.c:1981
-msgid "Three Color Raw Gloss"
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
 msgstr ""
 
-#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087
-#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099
-#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111
-#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123
-#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135
-#: src/main/escp2-channels.c:2141
-msgid "Four Color Raw"
+#: 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/main/escp2-channels.c:2147
-msgid "Four Color Raw Gloss"
+#: src/gutenprintui2/panel.c:2230
+msgid ""
+"Select whether scaling is measured as percent of available page size or "
+"number of output dots per inch"
+msgstr "指定放大縮�影�時的單�，是��尺寸的百分比，還是�英�有多少點"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "百分比"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "列�時，��指定�英�有多少點來放大縮�影�"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "指定列�時的影�寬度"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "指定列�時的影�高度"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
 msgstr ""
+"使用影�\n"
+"原來的尺寸"
 
-#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176
-msgid "Five Color Raw"
+#: 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/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206
-#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254
-msgid "Six Color Raw"
+#: 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/main/escp2-channels.c:2239
-msgid "Six Color Enhanced Gloss Raw"
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
 msgstr ""
 
-#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285
-#: src/main/escp2-channels.c:2300
-msgid "Seven Color Raw"
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
 msgstr ""
 
-#: src/main/escp2-channels.c:2317
-msgid "Seven Color Enhanced Gloss Raw"
+#: 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/main/escp2-channels.c:2335
-msgid "Eight Color Raw"
+#: 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:144
+msgid "Printer Features"
+msgstr "�表機功能"
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
 msgstr ""
 
-#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515
-#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537
-#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560
-#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600
-#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640
-#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658
-#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662
-#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694
-#: src/main/escp2-channels.c:2714
-msgid "EPSON Standard Inks"
+#: src/cups/genppd.c:150
+msgid "Common"
 msgstr ""
 
-#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759
-msgid "UltraChrome Photo Black"
+#: src/cups/genppd.c:151
+msgid "Extra 1"
 msgstr ""
 
-#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763
-msgid "UltraChrome Matte Black"
+#: src/cups/genppd.c:152
+msgid "Extra 2"
 msgstr ""
 
-#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816
-#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976
-msgid "Photo Black"
+#: src/cups/genppd.c:153
+msgid "Extra 3"
 msgstr ""
 
-#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798
-#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986
-msgid "Matte Black"
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr ""
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
 msgstr ""
 
-#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141
-#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167
-#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193
-#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981
-#: src/escputil/escputil.c:1204
+#. 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
+msgid "English"
+msgstr ""
+
+#: src/cups/genppd.c:1151 src/cups/genppd.c:1167 src/cups/genppd.c:1929
+#: src/cups/genppd.c:1930
+#, fuzzy
+msgid "Media Size"
+msgstr "紙張尺寸："
+
+#: src/cups/genppd.c:1240 src/cups/genppd.c:1965
+#, fuzzy
+msgid "Color Model"
+msgstr "彩色"
+
+#: src/cups/genppd.c:1267 src/cups/genppd.c:1967
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "�階"
+
+#: src/cups/genppd.c:1277 src/cups/genppd.c:1971
+#, fuzzy
+msgid "RGB Color"
+msgstr "彩色"
+
+#: src/cups/genppd.c:1284 src/cups/genppd.c:1972
+msgid "CMY Color"
+msgstr "CMY 色系"
+
+#: src/cups/genppd.c:1309 src/cups/genppd.c:1982
+#, fuzzy
+msgid "Color Precision"
+msgstr "色彩修正"
+
+#: src/cups/genppd.c:1565 src/cups/genppd.c:2075
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1582 src/cups/genppd.c:2091
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "雙�列�"
+
+#: src/cups/genppd.c:1607 src/cups/genppd.c:2108
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1612 src/cups/genppd.c:2109
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1613 src/cups/genppd.c:2110
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1614 src/cups/genppd.c:2111
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1708 src/cups/genppd.c:2157
+msgid "No"
+msgstr "�"
+
+#: src/cups/genppd.c:1710 src/cups/genppd.c:2159
+msgid "Yes"
+msgstr "是"
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:1815 src/cups/genppd.c:1859
+#: src/cups/genppd.c:2180 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#, fuzzy
+msgid "Value"
+msgstr "è—�"
+
+#: src/cups/genppd.c:1754 src/cups/genppd.c:2184
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil 版本 "
+
+#: src/escputil/escputil.c:76
+#, fuzzy
+msgid ""
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it\n"
+"under the terms of the GNU General Public License as published by the Free\n"
+"Software Foundation; either version 2 of the License, or (at your option)\n"
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
+"for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+msgstr ""
+"\n"
+"\n"
+"版權所有 © 1997-2003 Michael Sweet�Robert Krawitz\n"
+"�整個 Gutenprint 開發隊�。\n"
+"\n"
+"請�覽我們的網�： http://gimp-print.sourceforge.net\n"
+"\n"
+"本程�為自由軟體；您��據自由軟體基金會所發表的GNU通用公共授權�款�定，就本"
+"程��為散布與�或修改；無論您�據的是本授權的第二版或（您自行�擇的）任一日"
+"後發行的版本。\n"
+"本程�係基於使用目的而加以散布，然而�負任何擔�責任；亦無��售性或特定目的"
+"�用性所為的默示性擔�。詳情請�照 GNU 通用公共授權。\n"
+"您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金會："
+"59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
+
+#: src/escputil/escputil.c: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:333 src/escputil/escputil.c:341
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr ""
+
+#: src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer model."
+msgstr ""
+
+#: src/escputil/escputil.c:373
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:380
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:385
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "�項 %c �明\n"
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "用法：%s [�項] 指令\n"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:397
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:463
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "無法開啟�置 %s：%s\n"
+
+#: src/escputil/escputil.c:486
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "無法將指令�出至�表機\n"
+
+#: src/escputil/escputil.c:572
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:577
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "無法由 %s 讀�資料：%s\n"
+
+#: src/escputil/escputil.c:729
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:736
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:783
+#, fuzzy, c-format
+msgid "Unknown printer %s!\n"
+msgstr "�明�項 %s\n"
+
+#: src/escputil/escputil.c:819 src/escputil/escputil.c:1456
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "無法寫入 %s：%s\n"
+
+#: src/escputil/escputil.c:865 src/escputil/escputil.c:1421
+#: src/escputil/escputil.c:1549
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"無法寫入 %s：%s\n"
+
+#: src/escputil/escputil.c:908
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:976 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1469
+#: src/xml/xmli18n-tmp.h:1472 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1493
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1517
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:3011 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3438
+msgid "Photo Black"
+msgstr ""
+
+#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
+#: src/escputil/escputil.c:984 src/escputil/escputil.c:1299
+#: src/escputil/escputil.c:1325
+msgid "Unknown"
+msgstr "�詳"
+
+#: src/escputil/escputil.c:981 src/escputil/escputil.c:1267
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:2045
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2259
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2411
+#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2530
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2712
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2878 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2995
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143
-#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168
-#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194
-#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982
-#: src/escputil/escputil.c:1205
+#: src/escputil/escputil.c:982 src/escputil/escputil.c:1268
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:2046
+#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2412
+#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2531
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2879 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2994
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241
-#: src/escputil/escputil.c:985
+#: src/escputil/escputil.c:985 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
 msgid "Light Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:3182
-msgid "Dark Yellow"
+#: src/escputil/escputil.c:986 src/xml/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1470
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1476
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1491 src/xml/xmli18n-tmp.h:1494
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1506
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1515 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1521 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3446
+msgid "Matte Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989
+#: src/escputil/escputil.c:989 src/xml/xmli18n-tmp.h:2624
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:3014
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990
+#: src/escputil/escputil.c:990 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2993
 msgid "Light Light Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397
-#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489
-#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581
-msgid "Plain Paper Fast Load"
+#: src/escputil/escputil.c:991 src/escputil/escputil.c:1010
+#: src/xml/xmli18n-tmp.h:3013
+msgid "Orange"
 msgstr ""
 
-#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399
-#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491
-#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583
-#: src/main/xmli18n-tmp.h:5
-msgid "Postcard"
-msgstr "明信片"
+#: src/escputil/escputil.c:1022
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407
-#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499
-#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591
-msgid "Back Light Film"
+#: src/escputil/escputil.c:1025
+#, c-format
+msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411
-#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503
-#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595
-msgid "Matte Paper Heavyweight"
+#: src/escputil/escputil.c:1028
+#, c-format
+msgid "Status: Busy\n"
 msgstr ""
 
-# (Abel) from Epson
-#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421
-#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513
-#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605
-msgid "Premium Semigloss Photo Paper"
-msgstr "頂級柔光相紙"
+#: src/escputil/escputil.c:1031
+#, fuzzy, c-format
+msgid "Status: Waiting\n"
+msgstr "彩度"
 
-#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429
-#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525
-#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617
-msgid "ColorLife Paper"
+#: src/escputil/escputil.c:1034
+#, c-format
+msgid "Status: Idle\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
-#: src/main/escp2-papers.c:1609
-msgid "Archival Matte Paper"
+#: src/escputil/escputil.c:1037
+#, c-format
+msgid "Status: Paused\n"
 msgstr ""
 
-# (Abel) from Epson
-#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519
-#: src/main/escp2-papers.c:1611
-msgid "Watercolor Paper - Radiant White"
-msgstr "水彩紙-亮白色"
+#: src/escputil/escputil.c:1040
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853
-#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937
-#: src/main/escp2-papers.c:2012
-msgid "Roll Feed"
+#: src/escputil/escputil.c:1043
+#, c-format
+msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802
-msgid "Roll Feed (cut each page)"
+#: src/escputil/escputil.c:1046
+#, c-format
+msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811
-msgid "Roll Feed (do not cut)"
+#: src/escputil/escputil.c:1049
+#, c-format
+msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835
-msgid "Manual Feed"
-msgstr "人手�紙"
+#: src/escputil/escputil.c:1060
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844
-#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979
-msgid "Print to CD"
-msgstr "列�至光碟"
+#: src/escputil/escputil.c:1063
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
 
-#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "人手�紙"
+#: src/escputil/escputil.c:1066
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1069
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1072
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1075
+#, c-format
+msgid "Error: Paper out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1078
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1081
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1084
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1117
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1120
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1123
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1135
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1138
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1144
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1147
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1160
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1172
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1272 src/escputil/escputil.c:1311
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+msgid "Ink color"
+msgstr "墨水�色"
+
+#: src/escputil/escputil.c:1273 src/escputil/escputil.c:1312
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Percent remaining"
+msgstr ""
+
+#: src/escputil/escputil.c:1298
+#, fuzzy, c-format
+msgid "Printer Name: %s\n"
+msgstr "�表機�稱："
+
+#: src/escputil/escputil.c:1355
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1385
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1388
+msgid "status"
+msgstr "狀態"
+
+#: src/escputil/escputil.c:1393
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1499
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1640 src/escputil/escputil.c:1664
+#: src/escputil/escputil.c:1684
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1641 src/escputil/escputil.c:1665
+#: src/escputil/escputil.c:1685
+msgid "Date"
+msgstr "日期"
+
+#: src/escputil/escputil.c:1713
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1731
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "無法識別�表機型號。\n"
+
+#: src/escputil/escputil.c:1753
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1770
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1774
+#, 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:1809
+#, 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:1853
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1867 src/escputil/escputil.c:2036
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1870
+#, 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:1878 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:1902 src/escputil/escputil.c:1920
+#: src/escputil/escputil.c:2040
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1885
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1892
+#, 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:1899
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1907
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1913
+#, 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:1925
+#, c-format
+msgid "About to save settings..."
+msgstr "準備儲存設定..."
+
+#: src/escputil/escputil.c:1931
+#, c-format
+msgid "failed!\n"
+msgstr "失敗�\n"
+
+#: src/escputil/escputil.c:1932
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1936
+#, c-format
+msgid "succeeded!\n"
+msgstr "�功�\n"
+
+#: src/escputil/escputil.c:1937
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1942
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1945
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1950
+#, 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/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928
+#: src/escputil/escputil.c:2019 src/escputil/escputil.c:2050
+#: src/escputil/escputil.c:2093
+msgid "Press enter to continue > "
+msgstr "請按 enter 繼續 > "
+
+#: src/escputil/escputil.c:2026
+#, 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:2039
+#, c-format
+msgid "Pass #%d"
+msgstr "第 %d 次"
+
+#: src/escputil/escputil.c:2047 src/escputil/escputil.c:2092
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "請放入白紙。\n"
+
+#: src/escputil/escputil.c:2066
+#, c-format
+msgid "Number out of range!\n"
+msgstr "數字超出範�以外�\n"
+
+#: src/escputil/escputil.c:2071
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2077
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2084
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr ""
+
+#: src/escputil/escputil.c:2087
+#, c-format
+msgid "succeeded.\n"
+msgstr "�功。\n"
+
+#: src/escputil/escputil.c:2088
+#, 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:2134
+#, c-format
+msgid "Error in input\n"
+msgstr ""
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "列�中..."
+
+#: src/xml/xmli18n-tmp.h:2 src/xml/xmli18n-tmp.h:4 src/xml/xmli18n-tmp.h:6
+#: src/xml/xmli18n-tmp.h:8 src/xml/xmli18n-tmp.h:10 src/xml/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:14 src/xml/xmli18n-tmp.h:16 src/xml/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:20 src/xml/xmli18n-tmp.h:22 src/xml/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:26 src/xml/xmli18n-tmp.h:28 src/xml/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:32 src/xml/xmli18n-tmp.h:34 src/xml/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:38 src/xml/xmli18n-tmp.h:40 src/xml/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:44 src/xml/xmli18n-tmp.h:46 src/xml/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:50 src/xml/xmli18n-tmp.h:52 src/xml/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:56 src/xml/xmli18n-tmp.h:58 src/xml/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:62 src/xml/xmli18n-tmp.h:64 src/xml/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h: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:1103 src/xml/xmli18n-tmp.h:1105
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1117
+#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1121
+#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
+#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
+#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
+#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1193 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1205 src/xml/xmli18n-tmp.h:1208
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1214
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1223 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1235 src/xml/xmli18n-tmp.h:1238
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1244
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1250
+#: src/xml/xmli18n-tmp.h:1253 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1259 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1268
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1274
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1280
+#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1289 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1298
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1309 src/xml/xmli18n-tmp.h:1311
+#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1329 src/xml/xmli18n-tmp.h:1331
+#: src/xml/xmli18n-tmp.h:1333 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1586 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1595
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1619
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1631
+#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1708 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1722
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1730
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
+#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3219
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3286
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3348
+#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3376
+#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3498 src/xml/xmli18n-tmp.h:3504
+#: src/xml/xmli18n-tmp.h:3510
+msgid "EPSON Standard Inks"
+msgstr ""
+
+# (Abel) from fuji, epson
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
 #, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "人手�紙"
+msgid "Bright White Paper"
+msgstr "雪�銅版紙"
 
-#: src/main/escp2-papers.c:1961
-msgid "Rear Tray"
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1102 src/xml/xmli18n-tmp.h:1140
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1591
+#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:3582
+msgid "Postcard"
+msgstr "明信片"
+
+#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1148
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1261
+#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1751
+msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1970
-msgid "Front Tray"
+#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1267
+#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1366
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1552 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1719
+#: src/xml/xmli18n-tmp.h:1755
+msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/main/escp2-papers.c:1988
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Photo Board"
-msgstr "相紙"
+msgid "Premium Presentation Paper Matte"
+msgstr "精�光�相紙"
 
-#: src/main/escp2-papers.c:2027
-msgid "Cut Sheet Bin 1"
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:27
+#, fuzzy
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "頂級光�相紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:29
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "頂級光�相紙"
+
+# (Abel) from Canon
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:328
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "影�寫真光澤紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:968
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1444 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1765
+msgid "Premium Semigloss Photo Paper"
+msgstr "頂級柔光相紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:35
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "頂級柔光相紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:37
+#, fuzzy
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "頂級柔光相紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:41
+#, fuzzy
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "精�光�相紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "頂級光�相紙"
+
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:980
+#: src/xml/xmli18n-tmp.h:1037 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1132 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1294
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1735
+#: src/xml/xmli18n-tmp.h:1773
+msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:2036
-msgid "Cut Sheet Bin 2"
+#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:826 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:850 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:868 src/xml/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:874 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:898 src/xml/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:910 src/xml/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:922 src/xml/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:934 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:946 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:958 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:964 src/xml/xmli18n-tmp.h:967
+#: src/xml/xmli18n-tmp.h:970 src/xml/xmli18n-tmp.h:973
+#: src/xml/xmli18n-tmp.h:976 src/xml/xmli18n-tmp.h:979
+#: src/xml/xmli18n-tmp.h:982 src/xml/xmli18n-tmp.h:985
+#: src/xml/xmli18n-tmp.h:988 src/xml/xmli18n-tmp.h:991
+#: src/xml/xmli18n-tmp.h:994 src/xml/xmli18n-tmp.h:997
+#: src/xml/xmli18n-tmp.h:1000 src/xml/xmli18n-tmp.h:1003
+#: src/xml/xmli18n-tmp.h:1006 src/xml/xmli18n-tmp.h:1009
+#: src/xml/xmli18n-tmp.h:1012 src/xml/xmli18n-tmp.h:1015
+#: src/xml/xmli18n-tmp.h:1018 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1024 src/xml/xmli18n-tmp.h:1027
+#: src/xml/xmli18n-tmp.h:1030 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1036 src/xml/xmli18n-tmp.h:1039
+#: src/xml/xmli18n-tmp.h:1042 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1048 src/xml/xmli18n-tmp.h:1051
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1057
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1066 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1072 src/xml/xmli18n-tmp.h:1075
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1081
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1087
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1096 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1191
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1206 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1221
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:1563
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1572 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1599
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1611
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1638 src/xml/xmli18n-tmp.h:1641
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3137 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3207 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3217 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3302 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3347
+#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3399
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3461
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3469
+msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-papers.c:2045
-msgid "Cut Sheet Autoselect"
+#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1588
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1741
+msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/main/escp2-papers.c:2054
-msgid "Manual Selection"
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:1166 src/xml/xmli18n-tmp.h:1330
+#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1450
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1687
+msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
-msgid "360 x 90 DPI Fast Economy"
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1453
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1690
+msgid "Watercolor Paper - Radiant White"
+msgstr "水彩紙-亮白色"
+
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1349
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1373
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1397
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1409
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1433
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1445
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1454 src/xml/xmli18n-tmp.h:1457
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1463
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1643
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1649
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1673
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1679
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1691
+#: src/xml/xmli18n-tmp.h:1694 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1700 src/xml/xmli18n-tmp.h:1703
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3470
+msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-msgid "360 x 120 DPI Economy"
+#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1347 src/xml/xmli18n-tmp.h:1350
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1371 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1377 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1386
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1395 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1401 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1410
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1422
+#: src/xml/xmli18n-tmp.h:1425 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1446
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1455 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1461 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1677 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3484
+msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
-msgid "180 DPI Economy"
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1805 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:2112
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2882
+msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
-msgid "360 x 180 DPI Draft"
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1845
+#: src/xml/xmli18n-tmp.h:1858 src/xml/xmli18n-tmp.h:1874
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1932
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:2021
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2099
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2141
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2182 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2231 src/xml/xmli18n-tmp.h:2302
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2494
+msgid "180 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-msgid "360 x 240 DPI Draft"
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1820
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1933
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:2022
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
+#: src/xml/xmli18n-tmp.h:2232 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2567
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2669
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2883
+#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2973
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3015
+msgid "360 x 180 DPI Draft"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:68
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1821
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1934
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2101
+#: src/xml/xmli18n-tmp.h:2304 src/xml/xmli18n-tmp.h:2376
 msgid "360 DPI High Quality"
 msgstr "360 DPI 高�質"
 
-#: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
-#: src/main/escp2-resolutions.c:77
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1877
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2158 src/xml/xmli18n-tmp.h:2171
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2197
+#: src/xml/xmli18n-tmp.h:2207 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2248
+#: src/xml/xmli18n-tmp.h:2263 src/xml/xmli18n-tmp.h:2278
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2317 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2362 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2401
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2467 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2568 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2626 src/xml/xmli18n-tmp.h:2641
+#: src/xml/xmli18n-tmp.h:2654 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2884
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2953
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2988
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3016
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3064
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
+#: src/xml/xmli18n-tmp.h:1786 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1836 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2011
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2036
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2103 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2144
+#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2172
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2208 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2292 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2331
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2415 src/xml/xmli18n-tmp.h:2427
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2558
+#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2582
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2627 src/xml/xmli18n-tmp.h:2642
+#: src/xml/xmli18n-tmp.h:2655 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2775
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2975 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3003 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3049
+#: src/xml/xmli18n-tmp.h:3066
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:87
-#, fuzzy
-msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
-
-#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
+#: src/xml/xmli18n-tmp.h:1787 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2104 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2173
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2199
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2307
+#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2428
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2546 src/xml/xmli18n-tmp.h:2559
+#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2583
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2737
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2853
+#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2976 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3018
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3068
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
-msgid "720 DPI High Quality"
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2087 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2289
+#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2437 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2465 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2797
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3063
+msgid "360 x 120 DPI Economy"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:103
-msgid "720 DPI Highest Quality"
-msgstr "720 DPI 最高�質"
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1997
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2034
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2206 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2290
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2466 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2915
+msgid "360 x 240 DPI Draft"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:106
-#, fuzzy
-msgid "720 x 720 DPI"
-msgstr "720x720 DPI"
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:1925
+#: src/xml/xmli18n-tmp.h:1949 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2053
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2294
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3069
+msgid "720 DPI High Quality"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
-#: src/main/escp2-resolutions.c:125
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1865
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1897
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2079 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2147
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2223
+#: src/xml/xmli18n-tmp.h:2236 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2417
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2705 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2830
+#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2854
+#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:116
+#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1951
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2003
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2028
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2080 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2134 src/xml/xmli18n-tmp.h:2148
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2237 src/xml/xmli18n-tmp.h:2252
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2831
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
-#, fuzzy
-msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2344
+msgid "720 DPI Highest Quality"
+msgstr "720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
+#: src/xml/xmli18n-tmp.h:2212 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2238 src/xml/xmli18n-tmp.h:2253
+#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2572
+#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2832
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:135
+#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2254
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2833
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
-#: src/main/escp2-resolutions.c:145
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
-#: src/main/escp2-resolutions.c:158
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2660
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3072
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:155
-#, fuzzy
-msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 DPI"
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2532
+msgid "Dark Yellow"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:162
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2938
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3023
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3074
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 2880 DPI"
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2694
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2892
+#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2962
+#: src/xml/xmli18n-tmp.h:3022 src/xml/xmli18n-tmp.h:3039
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
-msgid "2880 x 2880 DPI"
-msgstr "2880 x 2880 DPI"
-
-#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:3024
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3075
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:558
-msgid "On"
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2945
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:3033
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3067
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2922
+#, fuzzy
+msgid "Black 1"
+msgstr "黑"
+
+#: src/xml/xmli18n-tmp.h:2923
+#, fuzzy
+msgid "Black 2"
+msgstr "黑"
+
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3048 src/xml/xmli18n-tmp.h:3065
+#, fuzzy
+msgid "360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2959
+#, fuzzy
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 DPI 最高�質"
+
+#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3101
+msgid "Rear Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
-#: src/main/escp2-resolutions.c:589
-msgid "Interleave"
+#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3102
+msgid "Front Tray"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
-#: src/main/escp2-resolutions.c:590
-msgid "Full Overlap"
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3084
+msgid "Manual Feed"
+msgstr "人手�紙"
+
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3103
+msgid "Print to CD"
+msgstr "列�至光碟"
+
+#: src/xml/xmli18n-tmp.h:3081 src/xml/xmli18n-tmp.h:3088
+msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
-#: src/main/escp2-resolutions.c:591
-msgid "Four Pass"
+#: src/xml/xmli18n-tmp.h:3082 src/xml/xmli18n-tmp.h:3089
+msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
-#: src/main/escp2-resolutions.c:592
-msgid "Full Overlap 2"
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3110
+msgid "Roll Feed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
-msgid "Interleave 2"
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3098
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "人手�紙"
+
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3099
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "人手�紙"
+
+#: src/xml/xmli18n-tmp.h:3104
+#, fuzzy
+msgid "Photo Board"
+msgstr "相紙"
+
+#: src/xml/xmli18n-tmp.h:3105
+msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:594
-msgid "Eight Pass"
+#: src/xml/xmli18n-tmp.h:3106
+msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
-#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33
-msgid "Fast Economy"
+#: src/xml/xmli18n-tmp.h:3107
+msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
-#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34
-msgid "Economy"
+#: src/xml/xmli18n-tmp.h:3108
+msgid "Manual Selection"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
-#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682
-#: src/main/generic-options.c:35
-msgid "Draft"
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3120
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3134
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3197
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3214
+#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3249 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3321
+#: src/xml/xmli18n-tmp.h:3333 src/xml/xmli18n-tmp.h:3343
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3513
+msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
-#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685
-#: src/main/generic-options.c:37
-msgid "High"
+#: src/xml/xmli18n-tmp.h:3115 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3187 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3205 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3265
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3344
+#: src/xml/xmli18n-tmp.h:3354 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3382 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3406 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3466 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3493 src/xml/xmli18n-tmp.h:3502
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3514
+msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
-#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684
-#: src/main/generic-options.c:38
-msgid "Photo"
-msgstr "相片"
+#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3144 src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3252 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3345
+#: src/xml/xmli18n-tmp.h:3355 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3375
+#: src/xml/xmli18n-tmp.h:3383 src/xml/xmli18n-tmp.h:3395
+#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3480
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3503
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3515
+msgid "Four Color Raw"
+msgstr ""
 
-#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
-#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686
-#: src/main/generic-options.c:39
-msgid "Super Photo"
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3239 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3495
+msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
-#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687
-#: src/main/generic-options.c:40
-msgid "Ultra Photo"
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3254
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3301
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3482
+#: src/xml/xmli18n-tmp.h:3496
+msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
-#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688
-#: src/main/generic-options.c:41
-msgid "Best"
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3186
+msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:46
-msgid "Text"
+#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3188
+msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:47
-msgid "Graphics"
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3189
+msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/generic-options.c:48
-msgid "Mixed Text and Graphics"
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3190
+msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/generic-options.c:49
-msgid "Photograph"
-msgstr "相片"
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3191
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr ""
 
-#: src/main/generic-options.c:50
-msgid "Line Art"
+#: src/xml/xmli18n-tmp.h:3210
+#, fuzzy
+msgid "Default Black"
+msgstr "�設"
+
+#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3243
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3280 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3485
+msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/generic-options.c:55
-msgid "Page"
+#: src/xml/xmli18n-tmp.h:3231
+msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/generic-options.c:56
-msgid "Job"
+#: src/xml/xmli18n-tmp.h:3241 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3423
+#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3483
+#: src/xml/xmli18n-tmp.h:3497
+msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:68
-msgid "Image Type"
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3476 src/xml/xmli18n-tmp.h:3490
+msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/generic-options.c:69
-msgid "Type of image being printed"
+#: src/xml/xmli18n-tmp.h:3250 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3492
+msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:74 src/main/generic-options.c:80
-msgid "Job Mode"
+#: src/xml/xmli18n-tmp.h:3271 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3447
+msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/generic-options.c:75
-msgid "Job vs. page mode"
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3285
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3453
+msgid "Eight Color Raw"
 msgstr ""
 
-#: src/main/generic-options.c:80
-msgid "Page Number"
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3373
+msgid "Four Color Photo"
 msgstr ""
 
-#: src/main/generic-options.c:81
-msgid "Page number"
+#: src/xml/xmli18n-tmp.h:3517 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3528
+msgid "Interleave"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1
-msgid "Letter"
-msgstr "Letter"
+#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3529
+msgid "Full Overlap"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:2
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3530
+msgid "Four Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3531
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3532
+msgid "Interleave 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3533
+msgid "Eight Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3535
+msgid "On"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3579
 msgid "Legal"
 msgstr "Legal"
 
-#: src/main/xmli18n-tmp.h:3
+#: src/xml/xmli18n-tmp.h:3580
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/main/xmli18n-tmp.h:4
+#: src/xml/xmli18n-tmp.h:3581
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:3586
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/xml/xmli18n-tmp.h:3587
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:3588
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:3589
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 相紙"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/xml/xmli18n-tmp.h:3590
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/xml/xmli18n-tmp.h:3591
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:3592
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/xml/xmli18n-tmp.h:3593
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:3595
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/xml/xmli18n-tmp.h:3596
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/xml/xmli18n-tmp.h:3597
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:3598
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/xml/xmli18n-tmp.h:3599
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:3600
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:3601
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:3602
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/xml/xmli18n-tmp.h:3603
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:3604
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/xml/xmli18n-tmp.h:3605
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:3606
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:3607
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/xml/xmli18n-tmp.h:3608
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/xml/xmli18n-tmp.h:3609
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:3610
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/xml/xmli18n-tmp.h:3611
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:3612
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:3613
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:3614
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:38
-msgid "A4"
-msgstr "A4"
-
-#: src/main/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:3616
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/xml/xmli18n-tmp.h:3617
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:3618
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:3619
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/xml/xmli18n-tmp.h:3620
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/xml/xmli18n-tmp.h:3621
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:3622
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/xml/xmli18n-tmp.h:3623
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/xml/xmli18n-tmp.h:3624
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:3625
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/xml/xmli18n-tmp.h:3626
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/xml/xmli18n-tmp.h:3627
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/xml/xmli18n-tmp.h:3628
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/xml/xmli18n-tmp.h:3629
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/xml/xmli18n-tmp.h:3630
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:3631
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/xml/xmli18n-tmp.h:3632
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/xml/xmli18n-tmp.h:3633
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/xml/xmli18n-tmp.h:3634
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/xml/xmli18n-tmp.h:3635
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/xml/xmli18n-tmp.h:3636
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:3637
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/xml/xmli18n-tmp.h:3638
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/xml/xmli18n-tmp.h:3639
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/xml/xmli18n-tmp.h:3640
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/xml/xmli18n-tmp.h:3641
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/xml/xmli18n-tmp.h:3642
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:3643
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/xml/xmli18n-tmp.h:3644
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/xml/xmli18n-tmp.h:3645
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/xml/xmli18n-tmp.h:3646
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/xml/xmli18n-tmp.h:3647
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/xml/xmli18n-tmp.h:3648
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:3649
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/xml/xmli18n-tmp.h:3650
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/xml/xmli18n-tmp.h:3651
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/xml/xmli18n-tmp.h:3652
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/xml/xmli18n-tmp.h:3653
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/xml/xmli18n-tmp.h:3654
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:3655
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/xml/xmli18n-tmp.h:3656
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/xml/xmli18n-tmp.h:3657
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/xml/xmli18n-tmp.h:3658
 #, fuzzy
 msgid "C0 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/xml/xmli18n-tmp.h:3659
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/xml/xmli18n-tmp.h:3660
 #, fuzzy
 msgid "C1 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:3661
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/xml/xmli18n-tmp.h:3662
 #, fuzzy
 msgid "C2 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/xml/xmli18n-tmp.h:3663
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/xml/xmli18n-tmp.h:3664
 #, fuzzy
 msgid "C3 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/xml/xmli18n-tmp.h:3665
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/xml/xmli18n-tmp.h:3666
 #, fuzzy
 msgid "C4 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:3667
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/xml/xmli18n-tmp.h:3668
 #, fuzzy
 msgid "C5 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/xml/xmli18n-tmp.h:3669
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/xml/xmli18n-tmp.h:3670
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/xml/xmli18n-tmp.h:3671
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/xml/xmli18n-tmp.h:3672
 #, fuzzy
 msgid "C6 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:3673
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/xml/xmli18n-tmp.h:3674
 #, fuzzy
 msgid "DL landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/xml/xmli18n-tmp.h:3675
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:3676
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:3677
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/xml/xmli18n-tmp.h:3678
 #, fuzzy
 msgid "C7 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/xml/xmli18n-tmp.h:3679
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:3680
 #, fuzzy
 msgid "C8 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:3681
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
 msgid "C9 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/xml/xmli18n-tmp.h:3683
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "C10 landscape"
 msgstr "橫�"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:3685
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:3686
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/xml/xmli18n-tmp.h:3687
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:3688
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:3689
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:3690
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/xml/xmli18n-tmp.h:3691
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:3692
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:3693
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:3694
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/xml/xmli18n-tmp.h:3695
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:3696
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:3697
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:3698
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/xml/xmli18n-tmp.h:3699
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:3700
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
-msgid "ISO A4"
-msgstr "ISO A4"
-
-#: src/main/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:3701
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/xml/xmli18n-tmp.h:3702
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:3703
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:3704
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
-msgid "ISO A5"
-msgstr "ISO A5"
-
-#: src/main/xmli18n-tmp.h:130
+#: src/xml/xmli18n-tmp.h:3705
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:3706
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:3707
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/xml/xmli18n-tmp.h:3708
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/xml/xmli18n-tmp.h:3709
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:135
+#: src/xml/xmli18n-tmp.h:3710
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/xml/xmli18n-tmp.h:3711
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:3712
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:3713
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/xml/xmli18n-tmp.h:3714
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:3715
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/xml/xmli18n-tmp.h:3716
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/xml/xmli18n-tmp.h:3717
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:3718
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/xml/xmli18n-tmp.h:3719
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:3720
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:3721
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/xml/xmli18n-tmp.h:3722
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:3723
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/xml/xmli18n-tmp.h:3724
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/xml/xmli18n-tmp.h:3725
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/xml/xmli18n-tmp.h:3726
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/xml/xmli18n-tmp.h:3727
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:3728
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:3729
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
-msgid "Custom"
-msgstr "自�"
-
-#: src/main/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:3731
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/xml/xmli18n-tmp.h:3732
 msgid "4 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/xml/xmli18n-tmp.h:3733
 msgid "5 Inch Roll Paper"
 msgstr "5 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/xml/xmli18n-tmp.h:3734
 msgid "210 mm Roll Paper"
 msgstr "210 毫米滾筒紙"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/xml/xmli18n-tmp.h:3735
 msgid "13 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:3736
+#, fuzzy
+msgid "17 Inch Roll Paper"
+msgstr "13 �滾筒紙"
+
+#: src/xml/xmli18n-tmp.h:3737
 msgid "22 Inch Roll Paper"
 msgstr "22 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:3738
 msgid "24 Inch Roll Paper"
 msgstr "24 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/xml/xmli18n-tmp.h:3739
 msgid "36 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:3740
 msgid "44 Inch Roll Paper"
 msgstr "44 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/xml/xmli18n-tmp.h:3741
+#, fuzzy
+msgid "60 Inch Roll Paper"
+msgstr "36 �滾筒紙"
+
+#: src/xml/xmli18n-tmp.h:3742
+#, fuzzy
+msgid "64 Inch Roll Paper"
+msgstr "4 �滾筒紙"
+
+#: src/xml/xmli18n-tmp.h:3743
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/xml/xmli18n-tmp.h:3744
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/xml/xmli18n-tmp.h:3745
 #, fuzzy
 msgid "Canon BJ-30"
 msgstr "Canon BJC 30"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/xml/xmli18n-tmp.h:3746
 #, fuzzy
 msgid "Canon BJC-50"
 msgstr "Canon BJC 50"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:3747
 #, fuzzy
 msgid "Canon BJC-55"
 msgstr "Canon BJC 55"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:3748
 #, fuzzy
 msgid "Canon BJC-80"
 msgstr "Canon BJC 80"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/xml/xmli18n-tmp.h:3749
 #, fuzzy
 msgid "Canon BJC-85"
 msgstr "Canon BJC 85"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:3750
 #, fuzzy
 msgid "Canon BJC-210"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/xml/xmli18n-tmp.h:3751
 #, fuzzy
 msgid "Canon BJC-240"
 msgstr "Canon BJC 240"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/xml/xmli18n-tmp.h:3752
 #, fuzzy
 msgid "Canon BJC-250"
 msgstr "Canon BJC 250"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/xml/xmli18n-tmp.h:3753
 #, fuzzy
 msgid "Canon BJC-1000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/xml/xmli18n-tmp.h:3754
 #, fuzzy
 msgid "Canon BJC-2000"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:3755
 #, fuzzy
 msgid "Canon BJC-2010"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:3756
 #, fuzzy
 msgid "Canon BJC-2100"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/xml/xmli18n-tmp.h:3757
 #, fuzzy
 msgid "Canon BJC-2110"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:3758
 #, fuzzy
 msgid "Canon BJC-3000"
 msgstr "Canon BJC 3000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/xml/xmli18n-tmp.h:3759
 #, fuzzy
 msgid "Canon BJC-4000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/xml/xmli18n-tmp.h:3760
 #, fuzzy
 msgid "Canon BJC-4300"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/xml/xmli18n-tmp.h:3761
 #, fuzzy
 msgid "Canon BJC-4400"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/xml/xmli18n-tmp.h:3762
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:3763
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:3764
 #, fuzzy
 msgid "Canon BJC-6000"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/xml/xmli18n-tmp.h:3765
 #, fuzzy
 msgid "Canon BJC-6100"
 msgstr "Canon BJC 6100"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:3766
 #, fuzzy
 msgid "Canon BJC-6200"
 msgstr "Canon BJC 6200"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/xml/xmli18n-tmp.h:3767
 #, fuzzy
 msgid "Canon BJC-6500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/xml/xmli18n-tmp.h:3768
 #, fuzzy
 msgid "Canon BJC-7000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/xml/xmli18n-tmp.h:3769
 #, fuzzy
 msgid "Canon BJC-7100"
 msgstr "Canon BJC 7100"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/xml/xmli18n-tmp.h:3770
 #, fuzzy
 msgid "Canon BJC-8200"
 msgstr "Canon BJC 8200"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:3771
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:3772
 #, fuzzy
 msgid "Canon S100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/xml/xmli18n-tmp.h:3773
 #, fuzzy
 msgid "Canon S200"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:3774
 #, fuzzy
 msgid "Canon S300"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/xml/xmli18n-tmp.h:3775
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/xml/xmli18n-tmp.h:3776
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/xml/xmli18n-tmp.h:3777
 #, fuzzy
 msgid "Canon S500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/xml/xmli18n-tmp.h:3778
 #, fuzzy
 msgid "Canon S600"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:3779
 #, fuzzy
 msgid "Canon S630"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:3780
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/xml/xmli18n-tmp.h:3781
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:3782
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/xml/xmli18n-tmp.h:3783
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon BJC 3000"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/xml/xmli18n-tmp.h:3784
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/xml/xmli18n-tmp.h:3785
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/xml/xmli18n-tmp.h:3786
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:3787
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:3788
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:3789
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:3790
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/xml/xmli18n-tmp.h:3791
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/xml/xmli18n-tmp.h:3792
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon BJC 3000"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:3793
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/xml/xmli18n-tmp.h:3794
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:3795
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:3796
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/xml/xmli18n-tmp.h:3797
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:3798
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/xml/xmli18n-tmp.h:3799
+#, fuzzy
+msgid "Canon PIXMA MP160"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:3800
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/xml/xmli18n-tmp.h:3801
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:3802
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/xml/xmli18n-tmp.h:3803
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:3804
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon BJC 6100"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:3805
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:3806
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon BJC 7100"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:3807
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon BJC 30"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/xml/xmli18n-tmp.h:3808
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon BJC 240"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/xml/xmli18n-tmp.h:3809
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon BJC 50"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:3810
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/xml/xmli18n-tmp.h:3811
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:3812
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon BJC 80"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:3813
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:3814
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon BJC 30"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:3815
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/xml/xmli18n-tmp.h:3816
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/xml/xmli18n-tmp.h:3817
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:3818
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/xml/xmli18n-tmp.h:3819
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:3820
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:3821
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC 85"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:3822
+#, fuzzy
+msgid "Epson Artisan 700"
+msgstr "Canon BJC 7000"
+
+#: src/xml/xmli18n-tmp.h:3823
+#, fuzzy
+msgid "Epson Artisan 800"
+msgstr "EPSON Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:3824
+#, fuzzy
+msgid "Epson B-300"
+msgstr "EPSON PM-3000C"
+
+#: src/xml/xmli18n-tmp.h:3825
+#, fuzzy
+msgid "Epson B-308"
+msgstr "EPSON PM-3000C"
+
+#: src/xml/xmli18n-tmp.h:3826
+#, fuzzy
+msgid "Epson B-500DN"
+msgstr "EPSON MC-5000"
+
+#: src/xml/xmli18n-tmp.h:3827
+#, fuzzy
+msgid "Epson B-508DN"
+msgstr "EPSON MC-5000"
+
+#: src/xml/xmli18n-tmp.h:3828
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:3829
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/xml/xmli18n-tmp.h:3830
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/xml/xmli18n-tmp.h:3831
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:3832
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/xml/xmli18n-tmp.h:3833
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:3834
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:3835
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:3836
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:3837
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/xml/xmli18n-tmp.h:3838
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/xml/xmli18n-tmp.h:3839
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:3840
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/xml/xmli18n-tmp.h:3841
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:3842
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:3843
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:3844
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:3845
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/xml/xmli18n-tmp.h:3846
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/xml/xmli18n-tmp.h:3847
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:3848
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/xml/xmli18n-tmp.h:3849
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:3850
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:3851
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:3852
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:3853
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/xml/xmli18n-tmp.h:3854
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/xml/xmli18n-tmp.h:3855
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:3856
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/xml/xmli18n-tmp.h:3857
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:3858
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:3859
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:3860
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:3861
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/xml/xmli18n-tmp.h:3862
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/xml/xmli18n-tmp.h:3863
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:3864
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/xml/xmli18n-tmp.h:3865
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:3866
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:3867
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:3868
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:3869
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/xml/xmli18n-tmp.h:3870
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/xml/xmli18n-tmp.h:3871
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/xml/xmli18n-tmp.h:3872
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/xml/xmli18n-tmp.h:3873
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:3874
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:3875
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/xml/xmli18n-tmp.h:3876
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:3877
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/xml/xmli18n-tmp.h:3878
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/xml/xmli18n-tmp.h:3879
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:3880
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/xml/xmli18n-tmp.h:3881
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:3882
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:3883
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/xml/xmli18n-tmp.h:3884
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:3885
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/xml/xmli18n-tmp.h:3886
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3887
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/xml/xmli18n-tmp.h:3888
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/xml/xmli18n-tmp.h:3889
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:3890
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:3891
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/xml/xmli18n-tmp.h:3892
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:3893
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/xml/xmli18n-tmp.h:3894
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "EPSON Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/xml/xmli18n-tmp.h:3895
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/xml/xmli18n-tmp.h:3896
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/xml/xmli18n-tmp.h:3897
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:3898
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:3899
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/xml/xmli18n-tmp.h:3900
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:3901
+#, fuzzy
+msgid "Epson Stylus Office B30"
+msgstr "EPSON Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:3902
+#, fuzzy
+msgid "Epson Stylus Office B33"
+msgstr "EPSON Stylus C43SX"
+
+#: src/xml/xmli18n-tmp.h:3903
+#, fuzzy
+msgid "Epson Stylus Office B40W"
+msgstr "EPSON Stylus C40SX"
+
+#: src/xml/xmli18n-tmp.h:3904
+#, fuzzy
+msgid "Epson Stylus Office T30"
+msgstr "EPSON Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:3905
+#, fuzzy
+msgid "Epson Stylus Office T33"
+msgstr "EPSON Stylus C43SX"
+
+#: src/xml/xmli18n-tmp.h:3906
+#, fuzzy
+msgid "Epson Stylus Office T40W"
+msgstr "EPSON Stylus C40SX"
+
+#: src/xml/xmli18n-tmp.h:3907
+#, fuzzy
+msgid "Epson Stylus Office BX300F"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3908
+#, fuzzy
+msgid "Epson Stylus Office BX600FW"
+msgstr "EPSON Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3909
+#, fuzzy
+msgid "Epson Stylus Office SX600FW"
+msgstr "EPSON Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3910
+#, fuzzy
+msgid "Epson Stylus Offixe TX300F"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:3911
+#, fuzzy
+msgid "Epson Stylus Office TX600FW"
+msgstr "EPSON Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:3912
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/xml/xmli18n-tmp.h:3913
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:3914
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/xml/xmli18n-tmp.h:3915
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/xml/xmli18n-tmp.h:3916
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:3917
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:3918
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/xml/xmli18n-tmp.h:3919
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:3920
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/xml/xmli18n-tmp.h:3921
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/xml/xmli18n-tmp.h:3922
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/xml/xmli18n-tmp.h:3923
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:3924
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:3925
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:3926
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/xml/xmli18n-tmp.h:3927
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:3928
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/xml/xmli18n-tmp.h:3929
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:3930
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/xml/xmli18n-tmp.h:3931
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/xml/xmli18n-tmp.h:3932
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:3933
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:3934
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/xml/xmli18n-tmp.h:3935
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:3936
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/xml/xmli18n-tmp.h:3937
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/xml/xmli18n-tmp.h:3938
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/xml/xmli18n-tmp.h:3939
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/xml/xmli18n-tmp.h:3940
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:3941
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:3942
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/xml/xmli18n-tmp.h:3943
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:3944
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/xml/xmli18n-tmp.h:3945
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/xml/xmli18n-tmp.h:3946
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/xml/xmli18n-tmp.h:3947
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/xml/xmli18n-tmp.h:3948
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:3949
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:3950
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/xml/xmli18n-tmp.h:3951
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:3952
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/xml/xmli18n-tmp.h:3953
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/xml/xmli18n-tmp.h:3954
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/xml/xmli18n-tmp.h:3955
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/xml/xmli18n-tmp.h:3956
+#, fuzzy
+msgid "Epson Stylus Photo R290"
+msgstr "EPSON Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:3957
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:3958
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:3959
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:3960
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:3961
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/xml/xmli18n-tmp.h:3962
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:3963
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:3964
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:3965
+#, fuzzy
+msgid "Epson Stylus Photo R800"
+msgstr "EPSON Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:3966
+#, fuzzy
+msgid "Epson Stylus Photo R1800"
+msgstr "EPSON Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3967
+#, fuzzy
+msgid "Epson Stylus Photo R1900"
+msgstr "EPSON Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:3968
+#, fuzzy
+msgid "Epson Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:3969
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:3970
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:3971
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:3972
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:3973
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:3974
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:3975
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:3976
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/xml/xmli18n-tmp.h:3977
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:3978
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:3979
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:3980
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/xml/xmli18n-tmp.h:3981
+#, fuzzy
+msgid "Epson Stylus Photo RX610"
+msgstr "EPSON Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:3982
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:3983
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:3984
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:3985
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/xml/xmli18n-tmp.h:3986
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:3987
 #, fuzzy
-msgid "Epson Stylus Photo RX700"
-msgstr "EPSON Stylus Photo RX400"
+msgid "Epson Stylus Photo RX690"
+msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:3988
 #, fuzzy
-msgid "Epson Stylus Photo R800"
-msgstr "EPSON Stylus Photo R800"
+msgid "Epson Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:3989
 #, fuzzy
-msgid "Epson Stylus Photo R1800"
-msgstr "EPSON Stylus Photo R1800"
+msgid "Epson Stylus Photo TX700W"
+msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:3990
 #, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "EPSON Stylus Photo R200"
+msgid "Epson Stylus Photo TX800W"
+msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:3991
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:3992
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:3993
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:3994
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:3995
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:3996
+#, fuzzy
+msgid "Epson Stylus Pro 7800"
+msgstr "EPSON Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3997
+#, fuzzy
+msgid "Epson Stylus Pro 7880"
+msgstr "EPSON Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:3998
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:3999
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/xml/xmli18n-tmp.h:4000
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:4001
+#, fuzzy
+msgid "Epson Stylus Pro 9800"
+msgstr "EPSON Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4002
+#, fuzzy
+msgid "Epson Stylus Pro 9880"
+msgstr "EPSON Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:4003
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:4004
+#, fuzzy
+msgid "Epson Stylus Pro 11880"
+msgstr "EPSON Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:4005
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:4006
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/xml/xmli18n-tmp.h:4007
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:4008
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:4009
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:4010
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:4011
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:4012
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:4013
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/xml/xmli18n-tmp.h:4014
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:4015
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:4016
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:4017
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:4018
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:4019
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/xml/xmli18n-tmp.h:4020
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:4021
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:4022
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/xml/xmli18n-tmp.h:4023
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/xml/xmli18n-tmp.h:4024
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:4025
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/xml/xmli18n-tmp.h:4026
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/xml/xmli18n-tmp.h:4027
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:4028
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:4029
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/xml/xmli18n-tmp.h:4030
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/xml/xmli18n-tmp.h:4031
+#, fuzzy
+msgid "Epson Stylus CX5500"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4032
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:4033
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:4034
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/xml/xmli18n-tmp.h:4035
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:4036
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:4037
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:4038
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:4039
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:4040
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/xml/xmli18n-tmp.h:4041
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:4042
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:4043
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/xml/xmli18n-tmp.h:4044
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/xml/xmli18n-tmp.h:4045
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:4046
+#, fuzzy
+msgid "Epson Stylus CX9300F"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4047
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/xml/xmli18n-tmp.h:4048
+#, fuzzy
+msgid "Epson Stylus CX9400F"
+msgstr "EPSON Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:4049
+#, fuzzy
+msgid "Epson Stylus CX9475F"
+msgstr "EPSON Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:4050
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/xml/xmli18n-tmp.h:4051
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:4052
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:4053
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/xml/xmli18n-tmp.h:4054
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:4055
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:4056
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:4057
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/xml/xmli18n-tmp.h:4058
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:4059
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:4060
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:4061
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:4062
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:4063
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/xml/xmli18n-tmp.h:4064
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:4065
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:4066
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/xml/xmli18n-tmp.h:4067
+#, fuzzy
+msgid "Epson Stylus DX9400F"
+msgstr "EPSON Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:4068
+#, fuzzy
+msgid "Epson Stylus NX100"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4069
+#, fuzzy
+msgid "Epson Stylus NX200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4070
+#, fuzzy
+msgid "Epson Stylus NX300"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4071
+#, fuzzy
+msgid "Epson Stylus NX400"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4072
+#, fuzzy
+msgid "Epson Stylus PX700FW"
+msgstr "EPSON Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#, fuzzy
+msgid "Epson Stylus PX800FW"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:4074
+#, fuzzy
+msgid "Epson Stylus S20"
+msgstr "EPSON Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:4075
+#, fuzzy
+msgid "Epson Stylus SX100"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4076
+#, fuzzy
+msgid "Epson Stylus SX105"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4077
+#, fuzzy
+msgid "Epson Stylus SX200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4078
+#, fuzzy
+msgid "Epson Stylus SX205"
+msgstr "EPSON Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:4079
+#, fuzzy
+msgid "Epson Stylus SX400"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4080
+#, fuzzy
+msgid "Epson Stylus SX405"
+msgstr "EPSON Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:4081
+#, fuzzy
+msgid "Epson Stylus T20"
+msgstr "EPSON Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:4082
+#, fuzzy
+msgid "Epson Stylus TX100"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4083
+#, fuzzy
+msgid "Epson Stylus TX200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:4084
+#, fuzzy
+msgid "Epson Stylus TX400"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:4086
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:4087
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:4088
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:4089
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/xml/xmli18n-tmp.h:4090
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:4091
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:4092
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:4093
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/xml/xmli18n-tmp.h:4094
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:4095
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4096
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:4097
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:4098
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:4099
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:4100
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:4101
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:4102
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:4103
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:4104
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4105
+#, fuzzy
+msgid "Epson WorkForce 40"
+msgstr "EPSON Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:4106
+#, fuzzy
+msgid "Epson WorkForce 500"
+msgstr "EPSON Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:4107
+#, fuzzy
+msgid "Epson WorkForce 600"
+msgstr "EPSON Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:4108
 #, fuzzy
 msgid "Epson CL 700"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:4109
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:4110
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/xml/xmli18n-tmp.h:4111
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:4112
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:4113
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:4114
 msgid "Epson E 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/xml/xmli18n-tmp.h:4115
 msgid "Epson E 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:4116
 msgid "Epson E 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:4117
 msgid "Epson E 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:4118
 msgid "Epson E 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "Epson EM 900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "Epson EM 930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Epson MC 2000"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "Epson MC 5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "Epson MC 7000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "Epson MC 9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Epson MC 10000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:4126
+#, fuzzy
+msgid "Epson ME Office 70"
+msgstr "Canon BJC 7000"
+
+#: src/xml/xmli18n-tmp.h:4127
+#, fuzzy
+msgid "Epson ME Office 80W"
+msgstr "EPSON PM-780C"
+
+#: src/xml/xmli18n-tmp.h:4128
+#, fuzzy
+msgid "Epson ME Office 700FW"
+msgstr "Canon BJC 7000"
+
+#: src/xml/xmli18n-tmp.h:4129
 #, fuzzy
 msgid "Epson MJ 930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:4130
 #, fuzzy
 msgid "Epson MJ 5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:4131
 #, fuzzy
 msgid "Epson MJ 6000C"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Epson MJ 8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:4133
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/xml/xmli18n-tmp.h:4134
 #, fuzzy
 msgid "Epson PM 700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/xml/xmli18n-tmp.h:4135
 #, fuzzy
 msgid "Epson PM 730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:4136
 #, fuzzy
 msgid "Epson PM 740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:4137
 #, fuzzy
 msgid "Epson PM 750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/xml/xmli18n-tmp.h:4138
 #, fuzzy
 msgid "Epson PM 760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:4139
 #, fuzzy
 msgid "Epson PM 770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Epson PM 780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/xml/xmli18n-tmp.h:4141
 #, fuzzy
 msgid "Epson PM 790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:4142
 #, fuzzy
 msgid "Epson PM 800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:4143
 #, fuzzy
 msgid "Epson PM 850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/xml/xmli18n-tmp.h:4144
 #, fuzzy
 msgid "Epson PM 870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/xml/xmli18n-tmp.h:4145
 #, fuzzy
 msgid "Epson PM 880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:4146
 #, fuzzy
 msgid "Epson PM 930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/xml/xmli18n-tmp.h:4147
 #, fuzzy
 msgid "Epson PM 940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Epson PM 950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:4149
 #, fuzzy
 msgid "Epson PM 970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Epson PM 980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/xml/xmli18n-tmp.h:4151
 #, fuzzy
 msgid "Epson PM 2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/xml/xmli18n-tmp.h:4152
 #, fuzzy
 msgid "Epson PM 2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:4153
 #, fuzzy
 msgid "Epson PM 3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:4154
 #, fuzzy
 msgid "Epson PM 3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:4155
 #, fuzzy
 msgid "Epson PM 3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:4156
 #, fuzzy
 msgid "Epson PM 3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/xml/xmli18n-tmp.h:4157
 #, fuzzy
 msgid "Epson PM 4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/xml/xmli18n-tmp.h:4158
 #, fuzzy
 msgid "Epson PM 5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:4159
 #, fuzzy
 msgid "Epson PM 7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:4160
 #, fuzzy
 msgid "Epson PM 9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:4161
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/xml/xmli18n-tmp.h:4162
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:4163
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/xml/xmli18n-tmp.h:4164
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/xml/xmli18n-tmp.h:4165
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:4166
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:4167
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/xml/xmli18n-tmp.h:4168
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:4169
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:4170
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/xml/xmli18n-tmp.h:4171
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:4173
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/xml/xmli18n-tmp.h:4177
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:4180
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/xml/xmli18n-tmp.h:4181
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/xml/xmli18n-tmp.h:4182
+#, fuzzy
+msgid "Epson Offirio PX B300"
+msgstr "EPSON PX-G900"
+
+#: src/xml/xmli18n-tmp.h:4183
+#, fuzzy
+msgid "Epson Offirio PX B500"
+msgstr "EPSON PX-V500"
+
+#: src/xml/xmli18n-tmp.h:4184
+#, fuzzy
+msgid "Epson PX 101"
+msgstr "EPSON PX-G900"
+
+#: src/xml/xmli18n-tmp.h:4185
+#, fuzzy
+msgid "Epson PX 201"
+msgstr "EPSON PX-G920"
+
+#: src/xml/xmli18n-tmp.h:4186
+#, fuzzy
+msgid "Epson PX 601F"
+msgstr "EPSON PX-V600"
+
+#: src/xml/xmli18n-tmp.h:4187
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:4188
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:4190
+#, fuzzy
+msgid "Epson PX G5300"
+msgstr "EPSON PX-G5000"
+
+#: src/xml/xmli18n-tmp.h:4191
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:4192
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/xml/xmli18n-tmp.h:4193
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/xml/xmli18n-tmp.h:4194
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:4195
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:4196
 #, fuzzy
 msgid "Epson PX 7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:4197
 #, fuzzy
 msgid "Epson PX 9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:4198
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:4199
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/xml/xmli18n-tmp.h:4200
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:4201
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:4202
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:4203
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:4204
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:4205
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:4206
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:4207
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:4208
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:4209
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:4210
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
-msgid "Brother HL-4Ve"
+#: src/xml/xmli18n-tmp.h:4211
+msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
-msgid "Brother HL-10V"
+#: src/xml/xmli18n-tmp.h:4212
+msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
-msgid "Brother HL-10h"
+#: src/xml/xmli18n-tmp.h:4213
+msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
-msgid "Brother HL-630"
+#: src/xml/xmli18n-tmp.h:4214
+msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
-msgid "Brother HL-660"
+#: src/xml/xmli18n-tmp.h:4215
+msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
-msgid "Brother HL-760"
+#: src/xml/xmli18n-tmp.h:4216
+msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
-msgid "Brother HL-960"
+#: src/xml/xmli18n-tmp.h:4217
+msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
-msgid "Brother HL-1040"
+#: src/xml/xmli18n-tmp.h:4218
+msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
-msgid "Brother HL-1050"
+#: src/xml/xmli18n-tmp.h:4219
+msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
-msgid "Brother HL-1060"
+#: src/xml/xmli18n-tmp.h:4220
+msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
-msgid "Brother HL-1070"
+#: src/xml/xmli18n-tmp.h:4221
+msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
-msgid "Brother HL-1240"
+#: src/xml/xmli18n-tmp.h:4222
+msgid "Brother HL-1430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
-msgid "Brother HL-1250"
+#: src/xml/xmli18n-tmp.h:4223
+msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
-msgid "Brother HL-1260"
+#: src/xml/xmli18n-tmp.h:4224
+msgid "Brother HL-1450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
-msgid "Brother HL-1270N"
+#: src/xml/xmli18n-tmp.h:4225
+msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
-msgid "Brother HL-1440"
+#: src/xml/xmli18n-tmp.h:4226
+msgid "Brother HL-1650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:4227
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:4228
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4229
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4230
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4231
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/xml/xmli18n-tmp.h:4232
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4233
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4234
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4235
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4236
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4237
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4238
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4239
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4240
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4241
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4242
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4243
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4244
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4245
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4246
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4247
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4248
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:4249
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:4250
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:4251
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:4252
 #, fuzzy
 msgid "Canon GP 335"
 msgstr "Canon BJC 30"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:4253
 #, fuzzy
 msgid "Canon LBP-4sx"
 msgstr "Canon BJC 240"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:4254
 #, fuzzy
 msgid "Canon LBP-430"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/xml/xmli18n-tmp.h:4255
 #, fuzzy
 msgid "Canon LBP-1000"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:4256
 #, fuzzy
 msgid "Canon LBP-1260"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:4257
 #, fuzzy
 msgid "Canon LBP-1760"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:4258
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:4259
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:4260
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:4261
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:4262
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:4263
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:4264
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:4265
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:4266
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/xml/xmli18n-tmp.h:4267
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:4268
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:4269
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:4270
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:4271
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:4272
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:4273
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:4274
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/xml/xmli18n-tmp.h:4275
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:4276
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:4277
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:4278
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:4279
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:4280
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:4281
+#, fuzzy
+msgid "Epson EPL-N2050"
+msgstr "EPSON PM-2000C"
+
+#: src/xml/xmli18n-tmp.h:4282
+#, fuzzy
+msgid "Epson EPL-N2050+"
+msgstr "EPSON PM-2000C"
+
+#: src/xml/xmli18n-tmp.h:4283
+#, fuzzy
+msgid "Epson EPL-N2050PS"
+msgstr "EPSON PM-850PT"
+
+#: src/xml/xmli18n-tmp.h:4284
+#, fuzzy
+msgid "Epson EPL-N2050PS+"
+msgstr "EPSON PM-850PT"
+
+#: src/xml/xmli18n-tmp.h:4285
+#, fuzzy
+msgid "Epson EPL-N2120"
+msgstr "EPSON PM-2200C"
+
+#: src/xml/xmli18n-tmp.h:4286
+#, fuzzy
+msgid "Epson EPL-N2500"
+msgstr "EPSON PX-V500"
+
+#: src/xml/xmli18n-tmp.h:4287
+#, fuzzy
+msgid "Epson EPL-N2500PS"
+msgstr "EPSON PX-V500"
+
+#: src/xml/xmli18n-tmp.h:4288
+#, fuzzy
+msgid "Epson EPL-N2750"
+msgstr "EPSON PM-750C"
+
+#: src/xml/xmli18n-tmp.h:4289
+#, fuzzy
+msgid "Epson EPL-N2750PS"
+msgstr "EPSON PM-750C"
+
+#: src/xml/xmli18n-tmp.h:4290
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:4291
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/xml/xmli18n-tmp.h:4292
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/xml/xmli18n-tmp.h:4293
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:4294
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:4295
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:4296
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:4297
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/xml/xmli18n-tmp.h:4298
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/xml/xmli18n-tmp.h:4299
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/xml/xmli18n-tmp.h:4300
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/xml/xmli18n-tmp.h:4301
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:4302
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:4303
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:4304
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4305
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4306
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4307
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4308
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4309
+msgid "Gestetner 3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4310
+msgid "Gestetner 4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4311
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4312
+msgid "Gestetner 4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4313
+msgid "Gestetner 4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4314
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4316
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4317
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4318
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4319
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4320
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4321
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4322
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4323
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4324
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4325
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4326
+msgid "Gestetner DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4327
+msgid "Gestetner DSm635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4328
+msgid "Gestetner DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4329
+msgid "Gestetner DS645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4330
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4331
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4332
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4333
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4334
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4335
+msgid "Gestetner DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4336
+msgid "Gestetner DSm735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4337
+msgid "Gestetner DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4338
+msgid "Gestetner DSm745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4339
+msgid "Gestetner MP1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4340
+msgid "Gestetner DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4341
+msgid "Gestetner MP1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4342
+msgid "Gestetner DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4343
+msgid "Gestetner MP1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4344
+msgid "Gestetner DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4345
+msgid "Gestetner MP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4346
+msgid "Gestetner DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4347
+msgid "Gestetner MP2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4348
+msgid "Gestetner DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4349
+msgid "Gestetner MP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4350
+msgid "Gestetner DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4351
+msgid "Gestetner MP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4352
+msgid "Gestetner DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4353
+msgid "Gestetner MP5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4354
+msgid "Gestetner DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4355
+msgid "Gestetner MP6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4356
+msgid "Gestetner DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4357
+msgid "Gestetner MP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4358
+msgid "Gestetner DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4359
+msgid "Gestetner MP9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4360
+msgid "Gestetner DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4361
+msgid "Gestetner MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4362
+msgid "Gestetner DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4363
+msgid "Gestetner MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4364
+msgid "Gestetner DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4365
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4366
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4367
+msgid "Gestetner MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368
+msgid "Gestetner DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4369
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4370
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4371
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4372
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4373
+#, fuzzy
+msgid "Gestetner MP 5000"
+msgstr "EPSON MC-5000"
+
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4375
 #, fuzzy
 msgid "HP Business Inkjet 2200"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/xml/xmli18n-tmp.h:4376
 #, fuzzy
 msgid "HP Business Inkjet 2230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/xml/xmli18n-tmp.h:4377
 #, fuzzy
 msgid "HP Business Inkjet 2250"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/xml/xmli18n-tmp.h:4378
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:4379
 #, fuzzy
 msgid "HP Business Inkjet 2280"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:4380
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:4381
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:4382
 #, fuzzy
 msgid "HP Color LaserJet 2500"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:4383
 #, fuzzy
 msgid "HP Color LaserJet 4500"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/xml/xmli18n-tmp.h:4384
 #, fuzzy
 msgid "HP Color LaserJet 4550"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:4385
 #, fuzzy
 msgid "HP Color LaserJet 4600"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:4386
 #, fuzzy
 msgid "HP Color LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/xml/xmli18n-tmp.h:4387
 #, fuzzy
 msgid "HP Color LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/xml/xmli18n-tmp.h:4388
 #, fuzzy
 msgid "HP Color LaserJet 5500"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:4389
 #, fuzzy
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:4390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:4391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:4392
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/xml/xmli18n-tmp.h:4393
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/xml/xmli18n-tmp.h:4394
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/xml/xmli18n-tmp.h:4395
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/xml/xmli18n-tmp.h:4396
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:4397
 #, fuzzy
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:4398
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:4399
 #, fuzzy
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/xml/xmli18n-tmp.h:4400
 #, fuzzy
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/xml/xmli18n-tmp.h:4401
 #, fuzzy
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/xml/xmli18n-tmp.h:4402
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:4403
 #, fuzzy
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:4404
 #, fuzzy
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:4405
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:4406
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:4407
 #, fuzzy
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/xml/xmli18n-tmp.h:4408
 #, fuzzy
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:4409
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:4410
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/xml/xmli18n-tmp.h:4411
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/xml/xmli18n-tmp.h:4412
 #, fuzzy
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:4413
 #, fuzzy
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:4414
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:4415
 #, fuzzy
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:4416
 #, fuzzy
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/xml/xmli18n-tmp.h:4417
 #, fuzzy
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/xml/xmli18n-tmp.h:4418
 #, fuzzy
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/xml/xmli18n-tmp.h:4419
 #, fuzzy
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/xml/xmli18n-tmp.h:4420
 #, fuzzy
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:4421
 #, fuzzy
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:4422
 #, fuzzy
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:4423
 #, fuzzy
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/xml/xmli18n-tmp.h:4424
 #, fuzzy
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/xml/xmli18n-tmp.h:4425
 #, fuzzy
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/xml/xmli18n-tmp.h:4426
 #, fuzzy
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:4427
 #, fuzzy
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:4428
 #, fuzzy
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:4429
 #, fuzzy
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:4430
 #, fuzzy
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:4431
 #, fuzzy
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:4432
 #, fuzzy
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/xml/xmli18n-tmp.h:4433
 #, fuzzy
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:4434
 #, fuzzy
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:4435
 #, fuzzy
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/xml/xmli18n-tmp.h:4436
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:4437
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:4438
 #, fuzzy
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:4439
 #, fuzzy
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:4440
 #, fuzzy
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:4441
 #, fuzzy
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/xml/xmli18n-tmp.h:4442
 #, fuzzy
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/xml/xmli18n-tmp.h:4443
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:4444
 #, fuzzy
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:4445
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:4446
 #, fuzzy
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:4447
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:4448
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/xml/xmli18n-tmp.h:4449
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:4450
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/xml/xmli18n-tmp.h:4451
 #, fuzzy
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:4452
 #, fuzzy
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:4453
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:4454
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:4455
 #, fuzzy
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:4456
 #, fuzzy
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/xml/xmli18n-tmp.h:4457
 #, fuzzy
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/xml/xmli18n-tmp.h:4458
 #, fuzzy
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:4459
 #, fuzzy
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:4460
 #, fuzzy
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:4461
 #, fuzzy
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:4462
 #, fuzzy
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:4463
 #, fuzzy
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:4464
 #, fuzzy
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:4465
 #, fuzzy
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/xml/xmli18n-tmp.h:4466
 #, fuzzy
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/xml/xmli18n-tmp.h:4467
 #, fuzzy
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:4468
 #, fuzzy
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:4469
 #, fuzzy
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:4470
 #, fuzzy
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:4471
 #, fuzzy
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:4472
 #, fuzzy
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/xml/xmli18n-tmp.h:4473
 #, fuzzy
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:4474
 #, fuzzy
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/xml/xmli18n-tmp.h:4475
 #, fuzzy
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:4476
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:4477
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:4478
 #, fuzzy
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:4479
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:4480
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/xml/xmli18n-tmp.h:4481
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/xml/xmli18n-tmp.h:4482
 #, fuzzy
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/xml/xmli18n-tmp.h:4483
 #, fuzzy
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:4484
 #, fuzzy
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:4485
 #, fuzzy
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:4486
 #, fuzzy
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:4487
 #, fuzzy
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:4488
 #, fuzzy
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/xml/xmli18n-tmp.h:4489
 #, fuzzy
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/xml/xmli18n-tmp.h:4490
 #, fuzzy
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/xml/xmli18n-tmp.h:4491
 #, fuzzy
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:4492
 #, fuzzy
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:4493
 #, fuzzy
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:4494
 #, fuzzy
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:4495
 #, fuzzy
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:4496
 #, fuzzy
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/xml/xmli18n-tmp.h:4497
 #, fuzzy
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/xml/xmli18n-tmp.h:4498
 #, fuzzy
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/xml/xmli18n-tmp.h:4499
 #, fuzzy
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:4500
 #, fuzzy
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:4501
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/xml/xmli18n-tmp.h:4502
 #, fuzzy
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/xml/xmli18n-tmp.h:4503
 #, fuzzy
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/xml/xmli18n-tmp.h:4504
 #, fuzzy
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:4505
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:4506
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:4507
 #, fuzzy
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/xml/xmli18n-tmp.h:4508
 #, fuzzy
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:4509
 #, fuzzy
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/xml/xmli18n-tmp.h:4510
 #, fuzzy
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/xml/xmli18n-tmp.h:4511
 #, fuzzy
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/xml/xmli18n-tmp.h:4512
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:4513
 #, fuzzy
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:4514
 #, fuzzy
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:4515
 #, fuzzy
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/xml/xmli18n-tmp.h:4516
 #, fuzzy
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:4517
 #, fuzzy
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/xml/xmli18n-tmp.h:4518
 #, fuzzy
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/xml/xmli18n-tmp.h:4519
 #, fuzzy
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/xml/xmli18n-tmp.h:4520
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:4521
 #, fuzzy
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:4522
 #, fuzzy
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:4523
 #, fuzzy
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/xml/xmli18n-tmp.h:4524
+#, fuzzy
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4525
 #, fuzzy
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:4526
 #, fuzzy
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/xml/xmli18n-tmp.h:4527
 #, fuzzy
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/xml/xmli18n-tmp.h:4528
+#, fuzzy
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4529
 #, fuzzy
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/xml/xmli18n-tmp.h:4530
 #, fuzzy
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:4531
 #, fuzzy
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:4532
 #, fuzzy
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:4533
+#, fuzzy
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4534
+#, fuzzy
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4535
+#, fuzzy
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4536
+#, fuzzy
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:4537
+#, fuzzy
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4538
+#, fuzzy
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4539
+#, fuzzy
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4540
+#, fuzzy
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4541
+#, fuzzy
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4542
 #, fuzzy
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/xml/xmli18n-tmp.h:4543
 #, fuzzy
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:4544
 #, fuzzy
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/xml/xmli18n-tmp.h:4545
 #, fuzzy
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/xml/xmli18n-tmp.h:4546
 #, fuzzy
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/xml/xmli18n-tmp.h:4547
 #, fuzzy
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:4548
 #, fuzzy
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:4549
 #, fuzzy
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:4550
+#, fuzzy
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4551
+#, fuzzy
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4552
+#, fuzzy
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4553
 #, fuzzy
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:4554
 #, fuzzy
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:4555
 #, fuzzy
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:4556
 #, fuzzy
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/xml/xmli18n-tmp.h:4557
+#, fuzzy
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4558
+#, fuzzy
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4559
 #, fuzzy
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/xml/xmli18n-tmp.h:4560
+#, fuzzy
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4561
+#, fuzzy
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4562
 #, fuzzy
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:4563
 #, fuzzy
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:4564
+#, fuzzy
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4565
+#, fuzzy
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4566
 #, fuzzy
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:4567
 #, fuzzy
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:4568
 #, fuzzy
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:4569
 #, fuzzy
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:4570
+#, fuzzy
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4571
+#, fuzzy
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4572
+#, fuzzy
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4573
+#, fuzzy
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4574
+#, fuzzy
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4575
+#, fuzzy
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4576
+#, fuzzy
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:4577
+#, fuzzy
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:4578
+#, fuzzy
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:4579
+#, fuzzy
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4580
+#, fuzzy
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:4581
+#, fuzzy
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4582
+#, fuzzy
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4583
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/xml/xmli18n-tmp.h:4584
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:4585
 #, fuzzy
 msgid "HP OfficeJet 300"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:4586
 #, fuzzy
 msgid "HP OfficeJet 330"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:4587
 #, fuzzy
 msgid "HP OfficeJet 350"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "HP OfficeJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:4589
 #, fuzzy
 msgid "HP OfficeJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:4590
 #, fuzzy
 msgid "HP OfficeJet 570"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:4591
 #, fuzzy
 msgid "HP OfficeJet 580"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/xml/xmli18n-tmp.h:4592
 #, fuzzy
 msgid "HP OfficeJet 590"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:4593
 #, fuzzy
 msgid "HP OfficeJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "HP OfficeJet 610"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:4595
 #, fuzzy
 msgid "HP OfficeJet 625"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:4596
 #, fuzzy
 msgid "HP OfficeJet 630"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:4597
 #, fuzzy
 msgid "HP OfficeJet 635"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:4598
 #, fuzzy
 msgid "HP OfficeJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:4599
 #, fuzzy
 msgid "HP OfficeJet 710"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/xml/xmli18n-tmp.h:4600
 #, fuzzy
 msgid "HP OfficeJet 720"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:4601
 #, fuzzy
 msgid "HP OfficeJet 725"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "HP OfficeJet 5105"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "HP OfficeJet 5110"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:4604
 #, fuzzy
 msgid "HP OfficeJet 5110xi"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:4605
 #, fuzzy
 msgid "HP OfficeJet 6105"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:4606
 #, fuzzy
 msgid "HP OfficeJet 6110"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:4607
 #, fuzzy
 msgid "HP OfficeJet 7110"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/xml/xmli18n-tmp.h:4608
 #, fuzzy
 msgid "HP OfficeJet 7130"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:4609
 #, fuzzy
 msgid "HP OfficeJet 7140"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "HP OfficeJet D125"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:4611
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:4612
 #, fuzzy
 msgid "HP OfficeJet D145"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:4613
 #, fuzzy
 msgid "HP OfficeJet D155"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:4614
 #, fuzzy
 msgid "HP OfficeJet G55"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/xml/xmli18n-tmp.h:4615
 #, fuzzy
 msgid "HP OfficeJet G85"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/xml/xmli18n-tmp.h:4616
 #, fuzzy
 msgid "HP OfficeJet G95"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:4617
 #, fuzzy
 msgid "HP OfficeJet K60"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:4618
 #, fuzzy
 msgid "HP OfficeJet K60xi"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:4619
 #, fuzzy
 msgid "HP OfficeJet K80"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:4620
 #, fuzzy
 msgid "HP OfficeJet K80xi"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:4621
 #, fuzzy
 msgid "HP OfficeJet LX"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/xml/xmli18n-tmp.h:4622
 #, fuzzy
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/xml/xmli18n-tmp.h:4623
 #, fuzzy
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/xml/xmli18n-tmp.h:4624
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:4625
 #, fuzzy
 msgid "HP OfficeJet R40"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:4626
 #, fuzzy
 msgid "HP OfficeJet R45"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:4627
 #, fuzzy
 msgid "HP OfficeJet R60"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:4628
 #, fuzzy
 msgid "HP OfficeJet R65"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:4629
 #, fuzzy
 msgid "HP OfficeJet R80"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/xml/xmli18n-tmp.h:4630
 #, fuzzy
 msgid "HP OfficeJet T45"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:4631
 #, fuzzy
 msgid "HP OfficeJet T65"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:4632
 #, fuzzy
 msgid "HP OfficeJet V40"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:4633
 #, fuzzy
 msgid "HP OfficeJet V40xi"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:4634
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:4635
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:4636
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:4637
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:4638
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/xml/xmli18n-tmp.h:4639
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/xml/xmli18n-tmp.h:4640
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:4641
 #, fuzzy
 msgid "HP PSC 2110"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:4642
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:4643
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:4644
 #, fuzzy
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:4645
 #, fuzzy
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/xml/xmli18n-tmp.h:4646
 #, fuzzy
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/xml/xmli18n-tmp.h:4647
 #, fuzzy
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/xml/xmli18n-tmp.h:4648
 #, fuzzy
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:4649
 #, fuzzy
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:4650
 #, fuzzy
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:4651
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:4652
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:4653
 #, fuzzy
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/xml/xmli18n-tmp.h:4654
 #, fuzzy
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:4655
 #, fuzzy
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:4656
 #, fuzzy
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:4657
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:4658
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:4659
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:4660
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:4661
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:4662
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/xml/xmli18n-tmp.h:4663
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4664
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4665
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/xml/xmli18n-tmp.h:4666
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4667
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4668
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4669
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4670
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4671
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4672
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4673
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4674
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4675
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4676
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4677
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4678
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4679
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4680
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4681
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4682
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4683
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4684
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4685
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4687
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4688
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4689
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4690
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4691
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4692
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4693
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4694
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4695
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4696
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4697
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4698
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4699
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4700
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4701
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4702
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4703
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4704
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4705
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4706
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4707
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4708
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4709
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4710
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4711
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4712
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4713
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4714
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4715
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4716
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:4717
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:4718
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:4719
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:4720
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:893
+#: src/xml/xmli18n-tmp.h:4721
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:4722
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:4723
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:896
+#: src/xml/xmli18n-tmp.h:4724
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:4725
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:4726
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:4727
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:900
+#: src/xml/xmli18n-tmp.h:4728
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:901
+#: src/xml/xmli18n-tmp.h:4729
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:4730
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:4731
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:4732
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:4733
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:4734
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:907
+#: src/xml/xmli18n-tmp.h:4735
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:4736
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:4737
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:4738
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:4739
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:912
+#: src/xml/xmli18n-tmp.h:4740
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:913
+#: src/xml/xmli18n-tmp.h:4741
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:4742
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:4743
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:4744
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:4745
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:4746
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:919
+#: src/xml/xmli18n-tmp.h:4747
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:4748
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:4749
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:4750
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:4751
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:924
+#: src/xml/xmli18n-tmp.h:4752
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:925
+#: src/xml/xmli18n-tmp.h:4753
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:4754
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:4755
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:4756
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:4757
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:4758
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:4759
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:4760
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:4761
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:934
-msgid "Lexmark 4076"
-msgstr "Lexmark 4076"
-
-#: src/main/xmli18n-tmp.h:935
-#, fuzzy
-msgid "Lexmark Optra E"
-msgstr "Lexmark Z42"
-
-#: src/main/xmli18n-tmp.h:936
-msgid "Lexmark Optra E+"
+#: src/xml/xmli18n-tmp.h:4762
+msgid "Lanier 5622"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:937
-#, fuzzy
-msgid "Lexmark Optra E220"
-msgstr "Lexmark Z42"
-
-#: src/main/xmli18n-tmp.h:938
-msgid "Lexmark Valuewriter 300"
+#: src/xml/xmli18n-tmp.h:4763
+msgid "Lanier 5627"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:939
-msgid "Minolta PagePro 6"
+#: src/xml/xmli18n-tmp.h:4764
+msgid "Lanier 5632"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:940
-msgid "Minolta PagePro 6e"
+#: src/xml/xmli18n-tmp.h:4765
+msgid "Lanier 5635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:941
-msgid "Minolta PagePro 6ex"
+#: src/xml/xmli18n-tmp.h:4766
+msgid "Lanier 5645"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:942
-msgid "Minolta PagePro 8"
+#: src/xml/xmli18n-tmp.h:4767
+msgid "Lanier LD0105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:943
-msgid "Minolta PagePro 8L"
+#: src/xml/xmli18n-tmp.h:4768
+msgid "Lanier LD015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:944
-msgid "Minolta PagePro 1100"
+#: src/xml/xmli18n-tmp.h:4769
+msgid "Lanier LD035"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:945
-msgid "NEC SuperScript 660i"
+#: src/xml/xmli18n-tmp.h:4770
+msgid "Lanier LD045"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:946
-msgid "NEC SuperScript 860"
+#: src/xml/xmli18n-tmp.h:4771
+msgid "Lanier LD060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:947
-msgid "NEC SuperScript 870"
+#: src/xml/xmli18n-tmp.h:4772
+msgid "Lanier LD075"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:948
-msgid "NEC SuperScript 1260"
+#: src/xml/xmli18n-tmp.h:4773
+msgid "Lanier LD090"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:949
-msgid "NEC SuperScript 1400"
+#: src/xml/xmli18n-tmp.h:4774
+msgid "Lanier LD115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:950
-msgid "NEC SuperScript 1800"
+#: src/xml/xmli18n-tmp.h:4775
+msgid "Lanier LD116"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:951
-msgid "Okidata OL400"
+#: src/xml/xmli18n-tmp.h:4776
+msgid "Lanier LD118"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:952
-msgid "Okidata OL400e"
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Lanier LD118d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:953
-msgid "Okidata OL400ex"
+#: src/xml/xmli18n-tmp.h:4778
+msgid "Lanier LD120"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:954
-msgid "Okidata OL410e"
+#: src/xml/xmli18n-tmp.h:4779
+msgid "Lanier LD120d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:955
-msgid "Okidata OL600e"
+#: src/xml/xmli18n-tmp.h:4780
+msgid "Lanier LD122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:956
-msgid "Okidata OL610e/S"
+#: src/xml/xmli18n-tmp.h:4781
+msgid "Lanier LD127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:957
-msgid "Okidata OL800"
+#: src/xml/xmli18n-tmp.h:4782
+msgid "Lanier LD132"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:958
-msgid "Okidata OL810ex"
+#: src/xml/xmli18n-tmp.h:4783
+msgid "Lanier LD135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:959
-msgid "Okidata Okipage 6e"
+#: src/xml/xmli18n-tmp.h:4784
+msgid "Lanier LD145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:960
-msgid "Okidata Okipage 6ex"
+#: src/xml/xmli18n-tmp.h:4785
+msgid "Lanier LD151"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:961
-msgid "Okidata Okipage 8p"
+#: src/xml/xmli18n-tmp.h:4786
+msgid "Lanier LD160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:962
-msgid "Okidata Okipage 10e"
+#: src/xml/xmli18n-tmp.h:4787
+msgid "Lanier LD175"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:963
-msgid "Okidata Okipage 10ex"
+#: src/xml/xmli18n-tmp.h:4788
+msgid "Lanier LD225"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:964
-msgid "Okidata Okipage 14ex"
+#: src/xml/xmli18n-tmp.h:4789
+msgid "Lanier LD230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:965
-msgid "Okidata Super 6e"
+#: src/xml/xmli18n-tmp.h:4790
+msgid "Lanier LD235"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:966
-msgid "Olivetti JP350S"
+#: src/xml/xmli18n-tmp.h:4791
+msgid "Lanier LD245"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:967
-msgid "Olivetti PG 306"
+#: src/xml/xmli18n-tmp.h:4792
+msgid "Lanier MP 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:968
-msgid "PCPI 1030"
+#: src/xml/xmli18n-tmp.h:4793
+msgid "Lanier LD125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:969
-msgid "Panasonic KX-P4410"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4794
+#, fuzzy
+msgid "Lanier MP 1100"
+msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:970
-msgid "Panasonic KX-P4450"
+#: src/xml/xmli18n-tmp.h:4795
+#, fuzzy
+msgid "Lanier LD1100"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:4796
+msgid "Lanier MP 1350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:971
-msgid "Panasonic KX-P6150"
+#: src/xml/xmli18n-tmp.h:4797
+msgid "Lanier LD1135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:972
-msgid "Panasonic KX-P6500"
+#: src/xml/xmli18n-tmp.h:4798
+msgid "Lanier MP 1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:973
-msgid "Raven LP-410"
+#: src/xml/xmli18n-tmp.h:4799
+msgid "Lanier LD316"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:974
-msgid "Ricoh Aficio 220"
+#: src/xml/xmli18n-tmp.h:4800
+msgid "Lanier MP 161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:975
-msgid "Ricoh Aficio 401"
+#: src/xml/xmli18n-tmp.h:4801
+msgid "Lanier LD016"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:976
-msgid "Ricoh Aficio 700"
+#: src/xml/xmli18n-tmp.h:4802
+msgid "Lanier MP 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:977
-msgid "Samsung ML-85"
+#: src/xml/xmli18n-tmp.h:4803
+msgid "Lanier LD320d"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:978
-msgid "Samsung ML-4600"
+#: src/xml/xmli18n-tmp.h:4804
+msgid "Lanier MP 2510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:979
-msgid "Samsung ML-5000a"
+#: src/xml/xmli18n-tmp.h:4805
+msgid "Lanier LD325"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:980
-msgid "Samsung ML-6000"
+#: src/xml/xmli18n-tmp.h:4806
+msgid "Lanier MP 2550B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:981
-msgid "Samsung ML-6100"
+#: src/xml/xmli18n-tmp.h:4807
+msgid "Lanier LD425B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:982
-msgid "Samsung ML-7000"
+#: src/xml/xmli18n-tmp.h:4808
+msgid "Lanier MP 2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:983
-msgid "Samsung ML-7000N"
+#: src/xml/xmli18n-tmp.h:4809
+msgid "Lanier LD425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:984
-msgid "Samsung ML-7000P"
+#: src/xml/xmli18n-tmp.h:4810
+msgid "Lanier MP 3010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:985
-msgid "Samsung ML-7050"
+#: src/xml/xmli18n-tmp.h:4811
+msgid "Lanier LD330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:986
-msgid "Samsung QL-5100A"
+#: src/xml/xmli18n-tmp.h:4812
+msgid "Lanier MP 3350B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:987
-msgid "Samsung QL-6050"
+#: src/xml/xmli18n-tmp.h:4813
+msgid "Lanier LD433B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:988
-msgid "Seiko SpeedJET 200"
+#: src/xml/xmli18n-tmp.h:4814
+#, fuzzy
+msgid "Lanier MP 3350"
+msgstr "Canon BJC 30"
+
+#: src/xml/xmli18n-tmp.h:4815
+msgid "Lanier LD433"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:989
-msgid "Sharp AR-161"
+#: src/xml/xmli18n-tmp.h:4816
+msgid "Lanier MP 3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:990
-msgid "Sharp AR-M257"
+#: src/xml/xmli18n-tmp.h:4817
+msgid "Lanier LD335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:991
-#, fuzzy
-msgid "Sony IJP-V100"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4818
+msgid "Lanier MP 4000B"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:992
-msgid "Star LS-04"
+#: src/xml/xmli18n-tmp.h:4819
+msgid "Lanier LD040B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:4820
 #, fuzzy
-msgid "Star LaserPrinter 8"
-msgstr "設定�表機"
+msgid "Lanier MP 4000"
+msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:994
-msgid "Tally MT908"
+#: src/xml/xmli18n-tmp.h:4821
+msgid "Lanier LD040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:995
-msgid "Xerox Able 1406"
+#: src/xml/xmli18n-tmp.h:4822
+msgid "Lanier MP 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:996
-msgid "Xerox DocuPrint 4508"
+#: src/xml/xmli18n-tmp.h:4823
+msgid "Lanier LD345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:997
-msgid "Xerox DocuPrint C20"
+#: src/xml/xmli18n-tmp.h:4824
+msgid "Lanier MP 5000B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:998
-msgid "Xerox DocuPrint N4512"
+#: src/xml/xmli18n-tmp.h:4825
+msgid "Lanier LD050B"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:999
-msgid "Xerox DocuPrint N4512PS"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:4826
+#, fuzzy
+msgid "Lanier MP 5000"
+msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:1000
-msgid "Xerox DocuPrint P12"
+#: src/xml/xmli18n-tmp.h:4827
+msgid "Lanier LD050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1001
-msgid "Xerox DocuPrint P1202"
+#: src/xml/xmli18n-tmp.h:4828
+msgid "Lanier MP 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1002
-msgid "Xerox DocuPrint P8e"
+#: src/xml/xmli18n-tmp.h:4829
+msgid "Lanier LD255"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1003
-msgid "Xerox Document Centre 400"
+#: src/xml/xmli18n-tmp.h:4830
+msgid "Lanier MP 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1004
-msgid "Xerox WorkCentre M118"
+#: src/xml/xmli18n-tmp.h:4831
+msgid "Lanier LD265"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1005
-msgid "Compaq IJ1200"
+#: src/xml/xmli18n-tmp.h:4832
+msgid "Lanier MP 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1006
-#, fuzzy
-msgid "Lexmark X73"
-msgstr "Lexmark Z43"
-
-#: src/main/xmli18n-tmp.h:1007
-msgid "Lexmark Z42"
-msgstr "Lexmark Z42"
-
-#: src/main/xmli18n-tmp.h:1008
-msgid "Lexmark Z43"
-msgstr "Lexmark Z43"
-
-#: src/main/xmli18n-tmp.h:1009
-msgid "Lexmark Z52"
-msgstr "Lexmark Z52"
-
-#: src/main/xmli18n-tmp.h:1010
-msgid "Lexmark Z53"
-msgstr "Lexmark Z53"
-
-#: src/main/xmli18n-tmp.h:1011
-#, fuzzy
-msgid "Olympus P-10"
-msgstr "Olympus P10"
-
-#: src/main/xmli18n-tmp.h:1012
-#, fuzzy
-msgid "Olympus P-11"
-msgstr "Olympus P10"
+#: src/xml/xmli18n-tmp.h:4833
+msgid "Lanier LD275"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1013
+#: src/xml/xmli18n-tmp.h:4834
 #, fuzzy
-msgid "Olympus P-200"
-msgstr "Olympus P200"
+msgid "Lanier MP 9000"
+msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:1014
-#, fuzzy
-msgid "Olympus P-300"
-msgstr "Olympus P300"
+#: src/xml/xmli18n-tmp.h:4835
+msgid "Lanier LD190"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1015
-#, fuzzy
-msgid "Olympus P-300E"
-msgstr "Olympus P300"
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:1016
+#: src/xml/xmli18n-tmp.h:4837
 #, fuzzy
-msgid "Olympus P-300U"
-msgstr "Olympus P300"
+msgid "Lexmark Optra E"
+msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:1017
-#, fuzzy
-msgid "Olympus P-330E"
-msgstr "Olympus P300"
+#: src/xml/xmli18n-tmp.h:4838
+msgid "Lexmark Optra E+"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:4839
 #, fuzzy
-msgid "Olympus P-330NE"
-msgstr "Olympus P300"
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:1019
+#: src/xml/xmli18n-tmp.h:4840
 #, fuzzy
-msgid "Olympus P-400"
-msgstr "Olympus P400"
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:1020
+#: src/xml/xmli18n-tmp.h:4841
 #, fuzzy
-msgid "Olympus P-440"
-msgstr "Olympus P440"
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:1021
-#, fuzzy
-msgid "Olympus P-S100"
-msgstr "Olympus P10"
+#: src/xml/xmli18n-tmp.h:4842
+msgid "Lexmark Valuewriter 300"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1022
-#, fuzzy
-msgid "Canon CP-10"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4843
+msgid "Minolta PagePro 6"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1023
-#, fuzzy
-msgid "Canon CP-100"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4844
+msgid "Minolta PagePro 6e"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1024
-#, fuzzy
-msgid "Canon CP-200"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4845
+msgid "Minolta PagePro 6ex"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1025
-#, fuzzy
-msgid "Canon CP-220"
-msgstr "Canon CP220"
+#: src/xml/xmli18n-tmp.h:4846
+msgid "Minolta PagePro 8"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1026
-#, fuzzy
-msgid "Canon CP-300"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4847
+msgid "Minolta PagePro 8L"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1027
-#, fuzzy
-msgid "Canon CP-330"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4848
+msgid "Minolta PagePro 1100"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1028
-#, fuzzy
-msgid "Canon SELPHY-CP-400"
-msgstr "Canon S400"
+#: src/xml/xmli18n-tmp.h:4849
+msgid "NEC SuperScript 660i"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1029
-#, fuzzy
-msgid "Canon SELPHY-CP-500"
-msgstr "Canon S4500"
+#: src/xml/xmli18n-tmp.h:4850
+msgid "NEC SuperScript 860"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1030
-#, fuzzy
-msgid "Canon SELPHY-CP-510"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4851
+msgid "NEC SuperScript 870"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1031
-#, fuzzy
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4852
+msgid "NEC SuperScript 1260"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1032
-#, fuzzy
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4853
+msgid "NEC SuperScript 1400"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1033
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon CP220"
+#: src/xml/xmli18n-tmp.h:4854
+msgid "NEC SuperScript 1800"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1034
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon CP100"
+#: src/xml/xmli18n-tmp.h:4855
+msgid "NRG 10515"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1035
-#, fuzzy
-msgid "Canon SELPHY-CP-740"
-msgstr "Canon S400"
+#: src/xml/xmli18n-tmp.h:4856
+msgid "NRG 10518"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1036
-#, fuzzy
-msgid "Canon SELPHY-CP-750"
-msgstr "Canon S450"
+#: src/xml/xmli18n-tmp.h:4857
+msgid "NRG 10512"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1037
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:4858
+msgid "NRG 2205"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1038
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:4859
+msgid "NRG 2238"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1039
-#, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon CP220"
+#: src/xml/xmli18n-tmp.h:4860
+msgid "NRG 2212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1040
-msgid "Sony DPP-EX5"
+#: src/xml/xmli18n-tmp.h:4861
+msgid "NRG 2705"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1041
-msgid "Sony DPP-EX7"
+#: src/xml/xmli18n-tmp.h:4862
+msgid "NRG 2738"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1042
-msgid "Sony UP-DP10"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4863
+msgid "NRG 2712"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1043
-#, fuzzy
-msgid "Sony UP-DR100"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4864
+msgid "NRG 3205"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1044
-#, fuzzy
-msgid "Sony UP-DR150"
-msgstr "Sony UP-DP10"
+#: src/xml/xmli18n-tmp.h:4865
+msgid "NRG 3238"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1045
-#, fuzzy
-msgid "Fujifilm Printpix-CX-400"
-msgstr "Fujifilm Printpix CX-400"
+#: src/xml/xmli18n-tmp.h:4866
+msgid "NRG 3212"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1046
-#, fuzzy
-msgid "Fujifilm Printpix-CX-550"
-msgstr "Fujifilm Printpix CX-550"
+#: src/xml/xmli18n-tmp.h:4867
+msgid "NRG 3525"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1047
-#, fuzzy
-msgid "Fujifilm FinePix-NX-500"
-msgstr "Fujifilm Printpix CX-400"
+#: src/xml/xmli18n-tmp.h:4868
+msgid "NRG 3508"
+msgstr ""
 
-#: src/main/xmli18n-tmp.h:1048
-msgid "Kodak Easyshare-Printer-Dock"
+#: src/xml/xmli18n-tmp.h:4869
+msgid "NRG 3502"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1049
-msgid "Shinko CHC-S9045"
+#: src/xml/xmli18n-tmp.h:4870
+msgid "NRG 3545"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1050
-msgid "RAW DATA 16 bit"
+#: src/xml/xmli18n-tmp.h:4871
+msgid "NRG 3518"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:1051
-msgid "RAW DATA 8 bit"
+#: src/xml/xmli18n-tmp.h:4872
+msgid "NRG 3532"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:130
-msgid "Curve type"
+#: src/xml/xmli18n-tmp.h:4873
+msgid "NRG 4525"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:131
-msgid "Is this curve linear, spline interpolated, or free-form"
+#: src/xml/xmli18n-tmp.h:4874
+msgid "NRG 4508"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:139
-msgid "Minimum X"
-msgstr "X 下�"
+#: src/xml/xmli18n-tmp.h:4875
+msgid "NRG 4502"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:140
-msgid "Minimum possible value for X"
+#: src/xml/xmli18n-tmp.h:4876
+msgid "NRG 4545"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:149
-msgid "Maximum X"
-msgstr "X 上�"
+#: src/xml/xmli18n-tmp.h:4877
+msgid "NRG 4518"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:150
-msgid "Maximum possible X value"
+#: src/xml/xmli18n-tmp.h:4878
+msgid "NRG 4532"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:159
-msgid "Minimum Y"
-msgstr "Y 下�"
+#: src/xml/xmli18n-tmp.h:4879
+msgid "NRG 6002"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:160
-msgid "Minimum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4880
+msgid "NRG 6005"
 msgstr ""
 
-#: src/gutenprintui2/curve.c:169
-msgid "Maximum Y"
-msgstr "Y 上�"
+#: src/xml/xmli18n-tmp.h:4881
+msgid "NRG 6008"
+msgstr ""
 
-#: src/gutenprintui2/curve.c:170
-msgid "Maximum possible value for Y"
+#: src/xml/xmli18n-tmp.h:4882
+msgid "NRG 7502"
 msgstr ""
 
-#: src/gutenprintui2/gammacurve.c:418
-msgid "_Gamma value"
-msgstr "_Gamma 值"
+#: src/xml/xmli18n-tmp.h:4883
+msgid "NRG 7505"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Inch"
-msgstr "英�"
+#: src/xml/xmli18n-tmp.h:4884
+msgid "NRG 7508"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:275
-msgid "Set the base unit of measurement to inches"
-msgstr "以英�作為長度單�"
+#: src/xml/xmli18n-tmp.h:4885
+msgid "NRG 9005"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "cm"
-msgstr "公分"
+#: src/xml/xmli18n-tmp.h:4886
+msgid "NRG 9008"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:277
-msgid "Set the base unit of measurement to centimetres"
-msgstr "以公分作為長度單�"
+#: src/xml/xmli18n-tmp.h:4887
+msgid "NRG 9002"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Points"
+#: src/xml/xmli18n-tmp.h:4888
+msgid "NRG DSm415"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:279
-msgid "Set the base unit of measurement to points (1/72\")"
+#: src/xml/xmli18n-tmp.h:4889
+msgid "NRG DSm615"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "mm"
-msgstr "毫米"
+#: src/xml/xmli18n-tmp.h:4890
+msgid "NRG DSm616"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:281
-msgid "Set the base unit of measurement to millimetres"
-msgstr "以毫米作為長度單�"
+#: src/xml/xmli18n-tmp.h:4891
+msgid "NRG DSm618"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Pica"
-msgstr "鉛點"
+#: src/xml/xmli18n-tmp.h:4892
+msgid "NRG DSm618d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:283
-msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "以鉛點 (1/12\") 作為長度單�"
+#: src/xml/xmli18n-tmp.h:4893
+msgid "NRG DSm620"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:290
-msgid "Color output"
-msgstr "使用彩色列�"
+#: src/xml/xmli18n-tmp.h:4894
+msgid "NRG DSm620d"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:292
-msgid "Print in shades of gray using black ink"
-msgstr "使用黑色墨水來列��階色彩"
+#: src/xml/xmli18n-tmp.h:4895
+msgid "NRG DSm622"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Standard Command"
-msgstr "標準指令"
+#: src/xml/xmli18n-tmp.h:4896
+msgid "NRG DSm627"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:304
-msgid "Use standard print command"
-msgstr "使用標準列�指令"
+#: src/xml/xmli18n-tmp.h:4897
+msgid "NRG DSm632"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Custom Command"
-msgstr "自�指令"
+#: src/xml/xmli18n-tmp.h:4898
+msgid "NRG DSm635"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:305
-msgid "Use custom print command"
-msgstr "使用自行指定的列�指令"
+#: src/xml/xmli18n-tmp.h:4899
+msgid "NRG DSm645"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710
-#: src/gutenprintui2/plist.c:793
-msgid "File"
-msgstr "檔案"
+#: src/xml/xmli18n-tmp.h:4900
+msgid "NRG DSm651"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:306
-msgid "Print to a file"
-msgstr "列�至檔案"
+#: src/xml/xmli18n-tmp.h:4901
+msgid "NRG DSm660"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:522
-msgid "Edit Curve..."
+#: src/xml/xmli18n-tmp.h:4902
+msgid "NRG DSm675"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:533
-msgid "Set Default"
+#: src/xml/xmli18n-tmp.h:4903
+msgid "NRG DSm725"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:535
-msgid "Restore Previous"
+#: src/xml/xmli18n-tmp.h:4904
+msgid "NRG DSm730"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708
-#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994
-msgid "OK"
-msgstr "確定"
+#: src/xml/xmli18n-tmp.h:4905
+msgid "NRG DSm735"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373
-#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964
-msgid "Cancel"
-msgstr "�消"
+#: src/xml/xmli18n-tmp.h:4906
+msgid "NRG DSm745"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:641
-#, fuzzy
-msgid "Select File..."
-msgstr "設定�表機..."
+#: src/xml/xmli18n-tmp.h:4907
+msgid "NRG MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1018
-msgid "Reset"
+#: src/xml/xmli18n-tmp.h:4908
+msgid "NRG MP 1350"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1356
-#, c-format
-msgid "%s -- Print v%s"
-msgstr "%s -- 列�增效模組 %s 版本"
+#: src/xml/xmli18n-tmp.h:4909
+msgid "NRG MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1365
-msgid "About"
-msgstr "關於"
+#: src/xml/xmli18n-tmp.h:4910
+msgid "NRG MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1367
-msgid ""
-"Print and\n"
-"Save Settings"
+#: src/xml/xmli18n-tmp.h:4911
+msgid "NRG MP 2000"
 msgstr ""
-"列�並\n"
-"儲存設定"
 
-#: src/gutenprintui2/panel.c:1369
-msgid ""
-"Save\n"
-"Settings"
+#: src/xml/xmli18n-tmp.h:4912
+msgid "NRG MP 2500"
 msgstr ""
-"儲存\n"
-"設定"
 
-#: src/gutenprintui2/panel.c:1371
-msgid "Print"
-msgstr "列�"
+#: src/xml/xmli18n-tmp.h:4913
+msgid "NRG MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1423
-msgid "Preview"
-msgstr "�覽"
+#: src/xml/xmli18n-tmp.h:4914
+msgid "NRG MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1448
-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."
+#: src/xml/xmli18n-tmp.h:4915
+msgid "NRG MP 2550B"
 msgstr ""
-"請在��中指定影��置。\n"
-"點�影�後，按定滑鼠第一個按鈕來拖曳影��以更改影��置。\n"
-"點�影�後，按定滑鼠第二個按鈕來拖曳影��以精確地更改影��置；�次移動的單"
-"�為一點 (1/72 英�)。\n"
-"點�影�後，按定滑鼠第三個(中央)按鈕來拖曳影�，�次移動的單�則是影�尺寸本"
-"身。\n"
-"拖曳影�時按下 shift �，會�制影���水平或垂直方�移動。\n"
-"如果拖曳的時候�按多一個滑鼠按鈕，影�會還原至原來�置。"
 
-#: src/gutenprintui2/panel.c:1495
-msgid "Paper Size"
-msgstr "紙張尺寸"
+#: src/xml/xmli18n-tmp.h:4916
+msgid "NRG MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1518
-msgid "Show All Paper Sizes"
-msgstr "顯示所有紙張尺寸"
+#: src/xml/xmli18n-tmp.h:4917
+msgid "NRG MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1534
-msgid "Dimensions:"
-msgstr "尺寸："
+#: src/xml/xmli18n-tmp.h:4918
+msgid "NRG MP 3350B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238
-msgid "Width:"
-msgstr "寬度："
+#: src/xml/xmli18n-tmp.h:4919
+msgid "NRG MP 3500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1540
-msgid "Width of the paper that you wish to print to"
-msgstr "列�時的紙張寬度"
+#: src/xml/xmli18n-tmp.h:4920
+msgid "NRG MP 4000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240
-msgid "Height:"
-msgstr "高度："
+#: src/xml/xmli18n-tmp.h:4921
+msgid "NRG MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1545
-msgid "Height of the paper that you wish to print to"
-msgstr "列�時的紙張高度"
+#: src/xml/xmli18n-tmp.h:4922
+msgid "NRG MP 4500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1550
-msgid "Automatic Paper Size"
+#: src/xml/xmli18n-tmp.h:4923
+msgid "NRG MP 5000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1567
-msgid "Number of Copies"
-msgstr "份數"
+#: src/xml/xmli18n-tmp.h:4924
+msgid "NRG MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1579
-msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "請�擇列�多少份 (1-100 之間)"
+#: src/xml/xmli18n-tmp.h:4925
+msgid "NRG MP 5500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1611
-msgid "Image Position"
-msgstr "影��置"
+#: src/xml/xmli18n-tmp.h:4926
+msgid "NRG MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1628
-msgid "Auto"
-msgstr "自動"
+#: src/xml/xmli18n-tmp.h:4927
+msgid "NRG MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1630
-msgid "Portrait"
-msgstr "直�"
+#: src/xml/xmli18n-tmp.h:4928
+msgid "NRG MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1632
-msgid "Landscape"
-msgstr "橫�"
+#: src/xml/xmli18n-tmp.h:4929
+msgid "Oki OL400"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1634
-msgid "Upside down"
-msgstr "直�倒置"
+#: src/xml/xmli18n-tmp.h:4930
+msgid "Oki OL400e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1636
-msgid "Seascape"
-msgstr "橫�倒置"
+#: src/xml/xmli18n-tmp.h:4931
+msgid "Oki OL400ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1640
-msgid ""
-"Select the orientation: portrait, landscape, upside down, or seascape "
-"(upside down landscape)"
-msgstr "指定列�時的方�：直��橫��直�倒置�橫�倒置"
+#: src/xml/xmli18n-tmp.h:4932
+msgid "Oki OL410e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1642
-msgid "Orientation:"
-msgstr "方�："
+#: src/xml/xmli18n-tmp.h:4933
+msgid "Oki OL600e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1653
-msgid "Left:"
-msgstr "左："
+#: src/xml/xmli18n-tmp.h:4934
+msgid "Oki OL610e/S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1654
-msgid "Distance from the left of the paper to the image"
-msgstr "從紙張左邊邊緣至影�之間的�離"
+#: src/xml/xmli18n-tmp.h:4935
+msgid "Oki OL800"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661
-msgid "Right:"
-msgstr "�："
+#: src/xml/xmli18n-tmp.h:4936
+msgid "Oki OL810ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1658
-msgid "Distance from the left of the paper to the right of the image"
-msgstr "從紙張左邊邊緣至影��邊邊緣之間的�離"
+#: src/xml/xmli18n-tmp.h:4937
+msgid "Oki Okipage 6e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1662
-msgid "Distance from the right of the paper to the image"
-msgstr "從紙張�邊邊緣至影�之間的�離"
+#: src/xml/xmli18n-tmp.h:4938
+msgid "Oki Okipage 6ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1664
-msgid "Top:"
-msgstr "上："
+#: src/xml/xmli18n-tmp.h:4939
+msgid "Oki Okipage 8p"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1665
-msgid "Distance from the top of the paper to the image"
-msgstr "從紙張頂部邊緣至影�之間的�離"
+#: src/xml/xmli18n-tmp.h:4940
+msgid "Oki Okipage 10e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672
-msgid "Bottom:"
-msgstr "下："
+#: src/xml/xmli18n-tmp.h:4941
+msgid "Oki Okipage 10ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1669
-msgid "Distance from the top of the paper to bottom of the image"
-msgstr "從紙張頂部邊緣至影�底部邊緣之間的�離"
+#: src/xml/xmli18n-tmp.h:4942
+msgid "Oki Okipage 14ex"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1673
-msgid "Distance from the bottom of the paper to the image"
-msgstr "從紙張底部邊緣至影�之間的�離"
+#: src/xml/xmli18n-tmp.h:4943
+#, fuzzy
+msgid "Oki Super 6e"
+msgstr "Super A0"
 
-#: src/gutenprintui2/panel.c:1683
-msgid "Center:"
-msgstr "置中："
+#: src/xml/xmli18n-tmp.h:4944
+msgid "Olivetti JP350S"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1686
-msgid "Horizontal"
-msgstr "æ°´å¹³"
+#: src/xml/xmli18n-tmp.h:4945
+msgid "Olivetti PG 306"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1687
-msgid "Center the image horizontally on the paper"
-msgstr "將影�的水平�置調整至紙張中間"
+#: src/xml/xmli18n-tmp.h:4946
+msgid "PCPI 1030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1689
-msgid "Both"
-msgstr "兩者"
+#: src/xml/xmli18n-tmp.h:4947
+msgid "Panasonic KX-P4410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1690
-msgid "Center the image on the paper"
-msgstr "將影�放置在紙張中間"
+#: src/xml/xmli18n-tmp.h:4948
+msgid "Panasonic KX-P4450"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1692
-msgid "Vertical"
-msgstr "åž‚ç›´"
+#: src/xml/xmli18n-tmp.h:4949
+msgid "Panasonic KX-P6150"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1693
-msgid "Center the image vertically on the paper"
-msgstr "將影�的垂直�置調整至紙張中間"
+#: src/xml/xmli18n-tmp.h:4950
+msgid "Panasonic KX-P6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1706
-msgid "Setup Printer"
-msgstr "設定�表機"
+#: src/xml/xmli18n-tmp.h:4951
+msgid "Raven LP-410"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1730
-msgid "Printer Make:"
+#: src/xml/xmli18n-tmp.h:4952
+msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1741
-msgid "Select the make of your printer"
+#: src/xml/xmli18n-tmp.h:4953
+msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847
-#: src/gutenprintui2/panel.c:2065
-msgid "Printer Model:"
-msgstr "�表機型號："
+#: src/xml/xmli18n-tmp.h:4954
+msgid "Ricoh Aficio 1032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1770
-msgid "Select your printer model"
-msgstr "請���表機型號"
+#: src/xml/xmli18n-tmp.h:4955
+msgid "Ricoh Aficio 1035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1818
-msgid "PPD File:"
-msgstr "PPD 檔："
+#: src/xml/xmli18n-tmp.h:4956
+msgid "Ricoh Aficio 1045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1834
-msgid "Enter the correct PPD filename for your printer"
-msgstr "請輸入��您的�表機使用的 PPD 檔案�稱"
+#: src/xml/xmli18n-tmp.h:4957
+msgid "Ricoh Aficio 1060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916
-msgid "Browse"
-msgstr "�覽"
+#: src/xml/xmli18n-tmp.h:4958
+msgid "Ricoh Aficio 1075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1843
-msgid "Choose the correct PPD filename for your printer"
-msgstr "請�擇��您的�表機使用的 PPD 檔案�稱"
+#: src/xml/xmli18n-tmp.h:4959
+msgid "Ricoh Aficio 1515"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1885
-msgid ""
-"Select the name of the output queue (not the type, or model, of printer) "
-"that you wish to print to"
+#: src/xml/xmli18n-tmp.h:4960
+msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1887
-msgid "Printer Queue:"
-msgstr "�表機佇列："
+#: src/xml/xmli18n-tmp.h:4961
+msgid "Ricoh Aficio 2016"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1903
-msgid "Enter the correct command to print to your printer. "
-msgstr "請輸入列�所使用的指令。"
+#: src/xml/xmli18n-tmp.h:4962
+msgid "Ricoh Aficio 2018"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1914
-msgid "Enter the file to print to. "
-msgstr "請輸入列�時寫入的檔案。"
+#: src/xml/xmli18n-tmp.h:4963
+msgid "Ricoh Aficio 2018D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1922
-msgid "File to print to"
+#: src/xml/xmli18n-tmp.h:4964
+msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:1930
-msgid "Print To File"
-msgstr "列�至檔案"
+#: src/xml/xmli18n-tmp.h:4965
+msgid "Ricoh Aficio 2020D"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1960
-msgid "Define New Printer"
-msgstr "定義新的�表機"
+#: src/xml/xmli18n-tmp.h:4966
+msgid "Ricoh Aficio 2022"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062
-msgid "Printer Name:"
-msgstr "�表機�稱："
+#: src/xml/xmli18n-tmp.h:4967
+msgid "Ricoh Aficio 2027"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1982
-msgid "Enter the name you wish to give this logical printer"
-msgstr "為這個虛擬�表機命�"
+#: src/xml/xmli18n-tmp.h:4968
+msgid "Ricoh Aficio 2032"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1992
-msgid "About Gutenprint "
-msgstr "關於 Gutenprint "
+#: src/xml/xmli18n-tmp.h:4969
+msgid "Ricoh Aficio 2035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:1999
-msgid "Gutenprint Version "
-msgstr "Gutenprint 版本 "
+#: src/xml/xmli18n-tmp.h:4970
+msgid "Ricoh Aficio 2035e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2047
-msgid "Printer Settings"
-msgstr "�表機設定"
+#: src/xml/xmli18n-tmp.h:4971
+msgid "Ricoh Aficio 2045"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2060
-msgid ""
-"Select the name of the printer (not the type, or model, of printer) that you "
-"wish to print to"
-msgstr "指定�表機�稱 (�是�表機類型或者型號)"
+#: src/xml/xmli18n-tmp.h:4972
+msgid "Ricoh Aficio 2045e"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2077
-msgid "Setup Printer..."
-msgstr "設定�表機..."
+#: src/xml/xmli18n-tmp.h:4973
+msgid "Ricoh Aficio 2051"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2079
-msgid ""
-"Choose the printer model, PPD file, and command that is used to print to "
-"this printer"
-msgstr "��列�時使用的�表機型號�PPD 檔�指令"
+#: src/xml/xmli18n-tmp.h:4974
+msgid "Ricoh Aficio 2060"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2092
-msgid "New Printer..."
-msgstr "新增�表機..."
+#: src/xml/xmli18n-tmp.h:4975
+msgid "Ricoh Aficio 2075"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2093
-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/xml/xmli18n-tmp.h:4976
+msgid "Ricoh Aficio 2090"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2123
-msgid "Set Printer Option Defaults"
+#: src/xml/xmli18n-tmp.h:4977
+msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2124
-msgid "Set all printer options to their defaults"
+#: src/xml/xmli18n-tmp.h:4978
+msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2147
-msgid "Image Size"
-msgstr "影�尺寸"
+#: src/xml/xmli18n-tmp.h:4979
+msgid "Ricoh Aficio 3025"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2172
-msgid "Scaling:"
-msgstr "縮放："
+#: src/xml/xmli18n-tmp.h:4980
+msgid "Ricoh Aficio 3030"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2176
-msgid "Set the scale (size) of the image"
-msgstr "指定影�的縮放比例 (尺寸)"
+#: src/xml/xmli18n-tmp.h:4981
+msgid "Ricoh Aficio 3035"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2198
-msgid "Scale by:"
+#: src/xml/xmli18n-tmp.h:4982
+msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2203
-msgid ""
-"Select whether scaling is measured as percent of available page size or "
-"number of output dots per inch"
-msgstr "指定放大縮�影�時的單�，是��尺寸的百分比，還是�英�有多少點"
+#: src/xml/xmli18n-tmp.h:4983
+msgid "Ricoh Aficio 401"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2206
-msgid "Percent"
-msgstr "百分比"
+#: src/xml/xmli18n-tmp.h:4984
+msgid "Ricoh Aficio 700"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2211
-msgid "Scale the print to the size of the page"
-msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
+#: src/xml/xmli18n-tmp.h:4985
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2215
-msgid "PPI"
-msgstr "PPI"
+#: src/xml/xmli18n-tmp.h:4986
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2220
-msgid "Scale the print to the number of dots per inch"
-msgstr "列�時，��指定�英�有多少點來放大縮�影�"
+#: src/xml/xmli18n-tmp.h:4987
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2238
-msgid "Set the width of the print"
-msgstr "指定列�時的影�寬度"
+#: src/xml/xmli18n-tmp.h:4988
+msgid "Ricoh Aficio MP 161"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2240
-msgid "Set the height of the print"
-msgstr "指定列�時的影�高度"
+#: src/xml/xmli18n-tmp.h:4989
+msgid "Ricoh Aficio MP 2000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2246
-msgid ""
-"Use Original\n"
-"Image Size"
+#: src/xml/xmli18n-tmp.h:4990
+msgid "Ricoh Aficio MP 2500"
 msgstr ""
-"使用影�\n"
-"原來的尺寸"
 
-#: src/gutenprintui2/panel.c:2252
-msgid "Set the print size to the size of the image"
-msgstr "將列�時的影�尺寸設定為影�原來的尺寸"
+#: src/xml/xmli18n-tmp.h:4991
+msgid "Ricoh Aficio MP 2510"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2276
-msgid "Print Color Adjust"
-msgstr "列�色彩調整"
+#: src/xml/xmli18n-tmp.h:4992
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2279
-msgid "Set Defaults"
+#: src/xml/xmli18n-tmp.h:4993
+msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2281
-msgid "Close"
-msgstr "關閉"
+#: src/xml/xmli18n-tmp.h:4994
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2310
-msgid "Image preview"
-msgstr "影��覽"
+#: src/xml/xmli18n-tmp.h:4995
+msgid "Ricoh Aficio MP 3350"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2324
-msgid "View Output Channels:"
+#: src/xml/xmli18n-tmp.h:4996
+msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2415
-msgid "Output"
+#: src/xml/xmli18n-tmp.h:4997
+msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2443
-msgid "Output Type:"
+#: src/xml/xmli18n-tmp.h:4998
+msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2447
-msgid "Select the desired output type"
-msgstr "指定輸出類型："
+#: src/xml/xmli18n-tmp.h:4999
+msgid "Ricoh Aficio MP 4000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2468
-msgid "Adjust Output..."
-msgstr "調整輸出�果..."
+#: src/xml/xmli18n-tmp.h:5000
+msgid "Ricoh Aficio MP 4500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2477
-msgid ""
-"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
-msgstr "調整色彩平衡�光度��差�彩度�擬色的�算方�"
+#: src/xml/xmli18n-tmp.h:5001
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2496
-msgid "Size Units:"
-msgstr "尺寸單�："
+#: src/xml/xmli18n-tmp.h:5002
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2499
-msgid " "
+#: src/xml/xmli18n-tmp.h:5003
+msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/gutenprintui2/panel.c:2523
-msgid "Units:"
-msgstr "單�："
+#: src/xml/xmli18n-tmp.h:5004
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
 
-#: src/gutenprintui2/panel.c:2528
-msgid "Select the base unit of measurement for printing"
-msgstr "指定列�時的基本長度單�"
+#: src/xml/xmli18n-tmp.h:5005
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
-msgid "System V lp"
-msgstr "System V lp"
+#: src/xml/xmli18n-tmp.h:5006
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:98
-msgid "CUPS"
-msgstr "CUPS"
+#: src/xml/xmli18n-tmp.h:5007
+msgid "Samsung ML-85"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:104
-msgid "Berkeley lpd (/etc/lpc)"
-msgstr "Berkeley lpd (/etc/lpc)"
+#: src/xml/xmli18n-tmp.h:5008
+msgid "Samsung ML-1250"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:107
-msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr "Berkeley lpd (/usr/bsd/lpc)"
+#: src/xml/xmli18n-tmp.h:5009
+msgid "Samsung ML-1450"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:110
-msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr "Berkeley lpd (/usr/etc/lpc"
+#: src/xml/xmli18n-tmp.h:5010
+msgid "Samsung ML-1450PS"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:113
-msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr "Berkeley lpd (/usr/libexec/lpc)"
+#: src/xml/xmli18n-tmp.h:5011
+msgid "Samsung ML-1650"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:116
-msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr "Berkeley lpd (/usr/sbin/lpc)"
+#: src/xml/xmli18n-tmp.h:5012
+msgid "Samsung ML-1651N"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1060
-msgid "Printer"
-msgstr "�表機"
+#: src/xml/xmli18n-tmp.h:5013
+msgid "Samsung ML-1750"
+msgstr ""
 
-#: src/gutenprintui2/plist.c:1253
-msgid "(Default Printer)"
-msgstr "(�設�表機)"
+#: src/xml/xmli18n-tmp.h:5014
+msgid "Samsung ML-2150"
+msgstr ""
 
-#: src/cups/genppd.c:145
-msgid "Printer Features"
-msgstr "�表機功能"
+#: src/xml/xmli18n-tmp.h:5015
+msgid "Samsung ML-2150PS"
+msgstr ""
 
-#: src/cups/genppd.c:146
-msgid "Output Control"
+#: src/xml/xmli18n-tmp.h:5016
+msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/cups/genppd.c:151
-msgid "Common"
+#: src/xml/xmli18n-tmp.h:5017
+msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/cups/genppd.c:152
-msgid "Extra 1"
+#: src/xml/xmli18n-tmp.h:5018
+msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/cups/genppd.c:153
-msgid "Extra 2"
+#: src/xml/xmli18n-tmp.h:5019
+msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/cups/genppd.c:154
-msgid "Extra 3"
+#: src/xml/xmli18n-tmp.h:5020
+msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/cups/genppd.c:155
-msgid "Extra 4"
+#: src/xml/xmli18n-tmp.h:5021
+msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/cups/genppd.c:156
-msgid "Extra 5"
+#: src/xml/xmli18n-tmp.h:5022
+msgid "Samsung ML-2551N"
 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:1064
-msgid "English"
+#: src/xml/xmli18n-tmp.h:5023
+msgid "Samsung ML-2552W"
 msgstr ""
 
-#. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:1066
-msgid "ISOLatin1"
+#: src/xml/xmli18n-tmp.h:5024
+msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/cups/genppd.c:1647
-#, fuzzy
-msgid "2-Sided Printing"
-msgstr "雙�列�"
+#: src/xml/xmli18n-tmp.h:5025
+msgid "Samsung ML-5000a"
+msgstr ""
 
-#: src/cups/genppd.c:1671
-msgid "Shrink Page If Necessary to Fit Borders"
+#: src/xml/xmli18n-tmp.h:5026
+msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/cups/genppd.c:1675
-msgid "Shrink (print the whole page)"
+#: src/xml/xmli18n-tmp.h:5027
+msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/cups/genppd.c:1676
-msgid "Crop (preserve dimensions)"
+#: src/xml/xmli18n-tmp.h:5028
+msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/cups/genppd.c:1677
-msgid "Expand (use maximum page area)"
+#: src/xml/xmli18n-tmp.h:5029
+msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/cups/genppd.c:1762
-msgid "No"
-msgstr "�"
+#: src/xml/xmli18n-tmp.h:5030
+msgid "Samsung ML-7000P"
+msgstr ""
 
-#: src/cups/genppd.c:1764
-msgid "Yes"
-msgstr "是"
+#: src/xml/xmli18n-tmp.h:5031
+msgid "Samsung ML-7050"
+msgstr ""
 
-#: src/cups/genppd.c:1801 src/cups/genppd.c:1863
-#, fuzzy
-msgid "Value"
-msgstr "è—�"
+#: src/xml/xmli18n-tmp.h:5032
+msgid "Samsung ML-7300"
+msgstr ""
 
-#: src/cups/genppd.c:1806
-msgid "Fine Adjustment"
+#: src/xml/xmli18n-tmp.h:5033
+msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/escputil/escputil.c:70
-msgid "Escputil version "
-msgstr "Escputil 版本 "
+#: src/xml/xmli18n-tmp.h:5034
+msgid "Samsung QL-5100A"
+msgstr ""
 
-#: src/escputil/escputil.c:76
-#, fuzzy
-msgid ""
-"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by the Free\n"
-"Software Foundation; either version 2 of the License, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n"
-"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-"for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#: src/xml/xmli18n-tmp.h:5035
+msgid "Samsung QL-6050"
 msgstr ""
-"\n"
-"\n"
-"版權所有 © 1997-2003 Michael Sweet�Robert Krawitz\n"
-"�整個 Gutenprint 開發隊�。\n"
-"\n"
-"請�覽我們的網�： http://gimp-print.sourceforge.net\n"
-"\n"
-"本程�為自由軟體；您��據自由軟體基金會所發表的GNU通用公共授權�款�定，就本"
-"程��為散布與�或修改；無論您�據的是本授權的第二版或（您自行�擇的）任一日"
-"後發行的版本。\n"
-"本程�係基於使用目的而加以散布，然而�負任何擔�責任；亦無��售性或特定目的"
-"�用性所為的默示性擔�。詳情請�照 GNU 通用公共授權。\n"
-"您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金會："
-"59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
 
-#: src/escputil/escputil.c: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"
+#: src/xml/xmli18n-tmp.h:5036
+msgid "Savin 2522"
 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"
+#: src/xml/xmli18n-tmp.h:5037
+msgid "Savin 2527"
 msgstr ""
 
-#: src/escputil/escputil.c:333 src/escputil/escputil.c:341
-#, c-format
-msgid "You may only specify one printer or raw device."
+#: src/xml/xmli18n-tmp.h:5038
+msgid "Savin 2532"
 msgstr ""
 
-#: src/escputil/escputil.c:349
-#, c-format
-msgid "You may only specify one printer model."
+#: src/xml/xmli18n-tmp.h:5039
+msgid "Savin 2535"
 msgstr ""
 
-#: src/escputil/escputil.c:373
-#, c-format
-msgid "Alignment choices must be at least 1."
+#: src/xml/xmli18n-tmp.h:5040
+msgid "Savin 2235"
 msgstr ""
 
-#: src/escputil/escputil.c:380
-#, c-format
-msgid "Alignment passes must be at least 1."
+#: src/xml/xmli18n-tmp.h:5041
+msgid "Savin 2545"
 msgstr ""
 
-#: src/escputil/escputil.c:385
-#, c-format
-msgid "Unknown option %c\n"
-msgstr "�項 %c �明\n"
+#: src/xml/xmli18n-tmp.h:5042
+msgid "Savin 2245"
+msgstr ""
 
-#: src/escputil/escputil.c:393
-#, c-format
-msgid "Usage: %s [OPTIONS] command\n"
-msgstr "用法：%s [�項] 指令\n"
+#: src/xml/xmli18n-tmp.h:5043
+#, fuzzy
+msgid "Savin 2560"
+msgstr "Canon S450"
 
-#: src/escputil/escputil.c:395
-#, c-format
-msgid "Type `%s --help' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5044
+msgid "Savin 2575"
 msgstr ""
 
-#: src/escputil/escputil.c:397
-#, c-format
-msgid "Type `%s -h' for more information.\n"
+#: src/xml/xmli18n-tmp.h:5045
+msgid "Savin 3515"
 msgstr ""
 
-#: src/escputil/escputil.c:463
-#, c-format
-msgid "Cannot open device %s: %s\n"
-msgstr "無法開啟�置 %s：%s\n"
+#: src/xml/xmli18n-tmp.h:5046
+msgid "Savin 40105"
+msgstr ""
 
-#: src/escputil/escputil.c:486
-#, c-format
-msgid "Cannot print to printer %s with %s\n"
+#: src/xml/xmli18n-tmp.h:5047
+msgid "Savin 4015"
 msgstr ""
 
-#: src/escputil/escputil.c:502 src/escputil/escputil.c:512
-#, c-format
-msgid "Unable to send command to printer\n"
-msgstr "無法將指令�出至�表機\n"
+#: src/xml/xmli18n-tmp.h:5048
+msgid "Savin 4018"
+msgstr ""
 
-#: src/escputil/escputil.c:572
-#, c-format
-msgid "Read from printer timed out\n"
+#: src/xml/xmli18n-tmp.h:5049
+msgid "Savin 4018d"
 msgstr ""
 
-#: src/escputil/escputil.c:577
-#, c-format
-msgid "Cannot read from %s: %s\n"
-msgstr "無法由 %s 讀�資料：%s\n"
+#: src/xml/xmli18n-tmp.h:5050
+msgid "Savin 4022"
+msgstr ""
 
-#: src/escputil/escputil.c:729
-#, c-format
-msgid "Please specify a raw device\n"
+#: src/xml/xmli18n-tmp.h:5051
+msgid "Savin 4027"
 msgstr ""
 
-#: src/escputil/escputil.c:736
-#, c-format
-msgid "Cannot open %s read/write: %s\n"
+#: src/xml/xmli18n-tmp.h:5052
+msgid "Savin 4035"
 msgstr ""
 
-#: src/escputil/escputil.c:783
-#, fuzzy, c-format
-msgid "Unknown printer %s!\n"
-msgstr "�明�項 %s\n"
+#: src/xml/xmli18n-tmp.h:5053
+msgid "Savin 4135g"
+msgstr ""
 
-#: src/escputil/escputil.c:819 src/escputil/escputil.c:1414
-#, c-format
-msgid "Cannot write to %s: %s\n"
-msgstr "無法寫入 %s：%s\n"
+#: src/xml/xmli18n-tmp.h:5054
+msgid "Savin 4035e"
+msgstr ""
 
-#: src/escputil/escputil.c:865 src/escputil/escputil.c:1379
-#: src/escputil/escputil.c:1507
-#, c-format
-msgid ""
-"\n"
-"Cannot write to %s: %s\n"
+#: src/xml/xmli18n-tmp.h:5055
+msgid "Savin 4135eG"
 msgstr ""
-"\n"
-"無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:908
-#, c-format
-msgid ""
-"\n"
-"Cannot detect printer type.\n"
-"Please use -m to specify your printer model.\n"
+#: src/xml/xmli18n-tmp.h:5056
+msgid "Savin 4045"
 msgstr ""
 
-#: src/escputil/escputil.c:977 src/escputil/escputil.c:983
-#: src/escputil/escputil.c:984 src/escputil/escputil.c:1253
-msgid "Unknown"
-msgstr "�詳"
+#: src/xml/xmli18n-tmp.h:5057
+msgid "Savin 4145g"
+msgstr ""
 
-#: src/escputil/escputil.c:1021
-#, c-format
-msgid "Status: Error\n"
+#: src/xml/xmli18n-tmp.h:5058
+msgid "Savin 4045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1024
-#, c-format
-msgid "Status: Self-Printing\n"
+#: src/xml/xmli18n-tmp.h:5059
+msgid "Savin 4145eG"
 msgstr ""
 
-#: src/escputil/escputil.c:1027
-#, c-format
-msgid "Status: Busy\n"
+#: src/xml/xmli18n-tmp.h:5060
+msgid "Savin 4051"
 msgstr ""
 
-#: src/escputil/escputil.c:1030
-#, fuzzy, c-format
-msgid "Status: Waiting\n"
-msgstr "彩度"
+#: src/xml/xmli18n-tmp.h:5061
+#, fuzzy
+msgid "Savin 4060"
+msgstr "Canon S400"
 
-#: src/escputil/escputil.c:1033
-#, c-format
-msgid "Status: Idle\n"
+#: src/xml/xmli18n-tmp.h:5062
+msgid "Savin 4075"
 msgstr ""
 
-#: src/escputil/escputil.c:1036
-#, c-format
-msgid "Status: Paused\n"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5063
+#, fuzzy
+msgid "Savin 4090"
+msgstr "Canon S400"
 
-#: src/escputil/escputil.c:1039
-#, c-format
-msgid "Status: Cleaning\n"
+#: src/xml/xmli18n-tmp.h:5064
+msgid "Savin 7025"
 msgstr ""
 
-#: src/escputil/escputil.c:1042
-#, c-format
-msgid "Status: Factory shipment\n"
+#: src/xml/xmli18n-tmp.h:5065
+msgid "Savin 8016"
 msgstr ""
 
-#: src/escputil/escputil.c:1045
-#, c-format
-msgid "Status: Shutting down\n"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5066
+#, fuzzy
+msgid "Savin 8020"
+msgstr "Canon S800"
 
-#: src/escputil/escputil.c:1048
-#, c-format
-msgid "Status: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5067
+msgid "Savin 8020d"
 msgstr ""
 
-#: src/escputil/escputil.c:1059
-#, c-format
-msgid "Error: Fatal Error\n"
+#: src/xml/xmli18n-tmp.h:5068
+msgid "Savin 8025"
 msgstr ""
 
-#: src/escputil/escputil.c:1062
-#, c-format
-msgid "Error: Other interface is selected\n"
+#: src/xml/xmli18n-tmp.h:5069
+msgid "Savin 8025e"
 msgstr ""
 
-#: src/escputil/escputil.c:1065
-#, c-format
-msgid "Error: Cover Open\n"
+#: src/xml/xmli18n-tmp.h:5070
+#, fuzzy
+msgid "Savin 8030"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:5071
+msgid "Savin 8030e"
 msgstr ""
 
-#: src/escputil/escputil.c:1068
-#, c-format
-msgid "Error: Paper jam\n"
+#: src/xml/xmli18n-tmp.h:5072
+msgid "Savin 8035"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
-#, c-format
-msgid "Error: Ink out\n"
+#: src/xml/xmli18n-tmp.h:5073
+msgid "Savin 8035g"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
-#, c-format
-msgid "Error: Paper out\n"
+#: src/xml/xmli18n-tmp.h:5074
+msgid "Savin 8035e"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
-#, c-format
-msgid "Error: Wait return from the tear-off position\n"
+#: src/xml/xmli18n-tmp.h:5075
+msgid "Savin 8045"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
-#, c-format
-msgid "Error: Double feed error\n"
+#: src/xml/xmli18n-tmp.h:5076
+msgid "Savin 8045g"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
-#, c-format
-msgid "Error: Unrecoverable cutter error\n"
+#: src/xml/xmli18n-tmp.h:5077
+msgid "Savin 8045e"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
-#, c-format
-msgid "Error: Recoverable cutter jam\n"
+#: src/xml/xmli18n-tmp.h:5078
+msgid "Savin 8055"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
-#, c-format
-msgid "Error: CD Tray Out\n"
+#: src/xml/xmli18n-tmp.h:5079
+#, fuzzy
+msgid "Savin 8065"
+msgstr "Canon BJC 85"
+
+#: src/xml/xmli18n-tmp.h:5080
+msgid "Savin 8075"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
-#, c-format
-msgid "Error: Card loading error\n"
+#: src/xml/xmli18n-tmp.h:5081
+#, fuzzy
+msgid "Savin 8090"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:5082
+msgid "Savin 8110"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
-#, c-format
-msgid "Error: Tray cover open\n"
+#: src/xml/xmli18n-tmp.h:5083
+msgid "Savin 8135"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
-#, c-format
-msgid "Error: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5084
+msgid "Savin 816"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
-#, c-format
-msgid "Printing nozzle self-test\n"
+#: src/xml/xmli18n-tmp.h:5085
+msgid "Savin 9016"
 msgstr ""
 
-#: src/escputil/escputil.c:1209 src/escputil/escputil.c:1239
-#, c-format
-msgid "Ink Levels:\n"
+#: src/xml/xmli18n-tmp.h:5086
+msgid "Savin 9021d"
 msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-msgid "Ink color"
-msgstr "墨水�色"
+#: src/xml/xmli18n-tmp.h:5087
+msgid "Savin 9025"
+msgstr ""
 
-#: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Percent remaining"
+#: src/xml/xmli18n-tmp.h:5088
+msgid "Savin 9025b"
 msgstr ""
 
-#: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290
-#: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296
-#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1302
-#, c-format
-msgid "Warning: Black Ink Low\n"
+#: src/xml/xmli18n-tmp.h:5089
+msgid "Savin 9033"
 msgstr ""
 
-#: src/escputil/escputil.c:1305
-#, c-format
-msgid "Warning: Unknown (%d)\n"
+#: src/xml/xmli18n-tmp.h:5090
+msgid "Savin 9033b"
 msgstr ""
 
-#: src/escputil/escputil.c:1314
-#, c-format
-msgid "Job Name: "
+#: src/xml/xmli18n-tmp.h:5091
+msgid "Savin 9040"
 msgstr ""
 
-#: src/escputil/escputil.c:1343
-msgid "ink levels"
+#: src/xml/xmli18n-tmp.h:5092
+msgid "Savin 9040b"
 msgstr ""
 
-#: src/escputil/escputil.c:1346
-msgid "status"
-msgstr "狀態"
+#: src/xml/xmli18n-tmp.h:5093
+msgid "Savin 9050"
+msgstr ""
 
-#: src/escputil/escputil.c:1351
-#, c-format
-msgid "Obtaining %s requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5094
+msgid "Savin 9050b"
 msgstr ""
 
-#: src/escputil/escputil.c:1457
-#, c-format
-msgid "Obtaining extended ink information requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5095
+msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Ink cartridge"
+#: src/xml/xmli18n-tmp.h:5096
+msgid "Sharp AR-161"
 msgstr ""
 
-#: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622
-#: src/escputil/escputil.c:1642
-msgid "Part number"
+#: src/xml/xmli18n-tmp.h:5097
+msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/escputil/escputil.c:1599 src/escputil/escputil.c:1623
-#: src/escputil/escputil.c:1643
-msgid "Date"
-msgstr "日期"
+#: src/xml/xmli18n-tmp.h:5098
+#, fuzzy
+msgid "Sony IJP-V100"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:1671
-#, c-format
-msgid "Printer identification requires using a raw device.\n"
+#: src/xml/xmli18n-tmp.h:5099
+msgid "Star LS-04"
 msgstr ""
 
-#: src/escputil/escputil.c:1689
-#, c-format
-msgid "Cannot identify printer model.\n"
-msgstr "無法識別�表機型號。\n"
+#: src/xml/xmli18n-tmp.h:5100
+#, fuzzy
+msgid "Star LaserPrinter 8"
+msgstr "設定�表機"
 
-#: src/escputil/escputil.c:1711
-#, c-format
-msgid "Cleaning heads...\n"
+#: src/xml/xmli18n-tmp.h:5101
+msgid "Tally MT908"
 msgstr ""
 
-#: src/escputil/escputil.c:1728
-#, c-format
-msgid "Running nozzle check, please ensure paper is in the printer.\n"
+#: src/xml/xmli18n-tmp.h:5102
+msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/escputil/escputil.c:1732
-#, 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"
+#: src/xml/xmli18n-tmp.h:5103
+msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/escputil/escputil.c:1767
-#, 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"
+#: src/xml/xmli18n-tmp.h:5104
+msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/escputil/escputil.c:1811
-#, c-format
-msgid "Unable to send command to the printer, exiting.\n"
+#: src/xml/xmli18n-tmp.h:5105
+msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994
-#, c-format
-msgid "Exiting\n"
+#: src/xml/xmli18n-tmp.h:5106
+msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/escputil/escputil.c:1828
-#, 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"
+#: src/xml/xmli18n-tmp.h:5107
+msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
-#: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
-#: src/escputil/escputil.c:1998
-msgid "> "
-msgstr "> "
-
-#: src/escputil/escputil.c:1843
-#, c-format
-msgid ""
-"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+#: src/xml/xmli18n-tmp.h:5108
+msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/escputil/escputil.c:1850
-#, 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"
+#: src/xml/xmli18n-tmp.h:5109
+msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
-#, c-format
-msgid ""
-"Please confirm by typing 'r' again that you wish to repeat the\n"
-"alignment process:\n"
+#: src/xml/xmli18n-tmp.h:5110
+msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/escputil/escputil.c:1865
-#, c-format
-msgid "Repeating the alignment process.\n"
+#: src/xml/xmli18n-tmp.h:5111
+msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/escputil/escputil.c:1871
-#, 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"
+#: src/xml/xmli18n-tmp.h:5112
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/escputil/escputil.c:1883
-#, c-format
-msgid "About to save settings..."
-msgstr "準備儲存設定..."
+#: src/xml/xmli18n-tmp.h:5113
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1889
-#, c-format
-msgid "failed!\n"
-msgstr "失敗�\n"
+#: src/xml/xmli18n-tmp.h:5114
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
 
-#: src/escputil/escputil.c:1890
-#, c-format
-msgid ""
-"Your settings were not saved successfully.  You must repeat the\n"
-"alignment procedure.\n"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5115
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
 
-#: src/escputil/escputil.c:1894
-#, c-format
-msgid "succeeded!\n"
-msgstr "�功�\n"
+#: src/xml/xmli18n-tmp.h:5116
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
 
-#: src/escputil/escputil.c:1895
-#, c-format
-msgid "Your alignment settings have been saved to the printer.\n"
+#: src/xml/xmli18n-tmp.h:5117
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
+
+#: src/xml/xmli18n-tmp.h:5118
+#, fuzzy
+msgid "Olympus P-10"
+msgstr "Olympus P10"
+
+#: src/xml/xmli18n-tmp.h:5119
+#, fuzzy
+msgid "Olympus P-11"
+msgstr "Olympus P10"
+
+#: src/xml/xmli18n-tmp.h:5120
+#, fuzzy
+msgid "Olympus P-200"
+msgstr "Olympus P200"
+
+#: src/xml/xmli18n-tmp.h:5121
+#, fuzzy
+msgid "Olympus P-300"
+msgstr "Olympus P300"
+
+#: src/xml/xmli18n-tmp.h:5122
+#, fuzzy
+msgid "Olympus P-300E"
+msgstr "Olympus P300"
+
+#: src/xml/xmli18n-tmp.h:5123
+#, fuzzy
+msgid "Olympus P-300U"
+msgstr "Olympus P300"
+
+#: src/xml/xmli18n-tmp.h:5124
+#, fuzzy
+msgid "Olympus P-330E"
+msgstr "Olympus P300"
+
+#: src/xml/xmli18n-tmp.h:5125
+#, fuzzy
+msgid "Olympus P-330NE"
+msgstr "Olympus P300"
+
+#: src/xml/xmli18n-tmp.h:5126
+#, fuzzy
+msgid "Olympus P-400"
+msgstr "Olympus P400"
+
+#: src/xml/xmli18n-tmp.h:5127
+#, fuzzy
+msgid "Olympus P-440"
+msgstr "Olympus P440"
+
+#: src/xml/xmli18n-tmp.h:5128
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P10"
+
+#: src/xml/xmli18n-tmp.h:5129
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5130
+#, fuzzy
+msgid "Canon CP-100"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5131
+#, fuzzy
+msgid "Canon CP-200"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5132
+#, fuzzy
+msgid "Canon CP-220"
+msgstr "Canon CP220"
+
+#: src/xml/xmli18n-tmp.h:5133
+#, fuzzy
+msgid "Canon CP-300"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5134
+#, fuzzy
+msgid "Canon CP-330"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5135
+#, fuzzy
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:5136
+#, fuzzy
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:5137
+#, fuzzy
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5138
+#, fuzzy
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5139
+#, fuzzy
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5140
+#, fuzzy
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon CP220"
+
+#: src/xml/xmli18n-tmp.h:5141
+#, fuzzy
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:5142
+#, fuzzy
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:5143
+#, fuzzy
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:5144
+msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/escputil/escputil.c:1900
-#, c-format
-msgid "Unrecognized command.\n"
+#: src/xml/xmli18n-tmp.h:5145
+msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/escputil/escputil.c:1903
-#, c-format
-msgid "Final command was not confirmed.\n"
+#: src/xml/xmli18n-tmp.h:5146
+#, fuzzy
+msgid "Canon SELPHY ES20"
+msgstr "Canon CP220"
+
+#: src/xml/xmli18n-tmp.h:5147
+msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/escputil/escputil.c:1908
-#, 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"
+#: src/xml/xmli18n-tmp.h:5148
+msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008
-#: src/escputil/escputil.c:2051
-msgid "Press enter to continue > "
-msgstr "請按 enter 繼續 > "
+#: src/xml/xmli18n-tmp.h:5149
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:1984
-#, 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/xml/xmli18n-tmp.h:5150
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:1997
-#, c-format
-msgid "Pass #%d"
-msgstr "第 %d 次"
+#: src/xml/xmli18n-tmp.h:5151
+#, fuzzy
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DP10"
 
-#: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050
-#, c-format
-msgid "Please insert a fresh sheet of paper.\n"
-msgstr "請放入白紙。\n"
+#: src/xml/xmli18n-tmp.h:5152
+#, fuzzy
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix CX-400"
 
-#: src/escputil/escputil.c:2024
-#, c-format
-msgid "Number out of range!\n"
-msgstr "數字超出範�以外�\n"
+#: src/xml/xmli18n-tmp.h:5153
+#, fuzzy
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix CX-550"
 
-#: src/escputil/escputil.c:2029
-#, c-format
-msgid "I cannot understand what you typed!\n"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:5154
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix CX-400"
 
-#: src/escputil/escputil.c:2035
-#, c-format
-msgid "The best pair of lines should be numbered between 1 and %d.\n"
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/escputil/escputil.c:2042
-#, c-format
-msgid "Attempting to set alignment..."
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/escputil/escputil.c:2045
-#, c-format
-msgid "succeeded.\n"
-msgstr "�功。\n"
-
-#: src/escputil/escputil.c:2046
-#, 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"
+#: src/xml/xmli18n-tmp.h:5157
+msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/escputil/escputil.c:2092
-#, c-format
-msgid "Error in input\n"
+#: src/xml/xmli18n-tmp.h:5158
+msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gimp2/print-image-gimp.c:225
-msgid "Printing..."
-msgstr "列�中..."
+#, fuzzy
+#~ msgid "Three Level Grayscale"
+#~ msgstr "�階"
+
+#, fuzzy
+#~ msgid "720 x 720 DPI"
+#~ msgstr "720x720 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Transposed"
+#~ msgstr "2880 x 1440 DPI"
+
+#~ msgid "ISO A4"
+#~ msgstr "ISO A4"
+
+#~ msgid "ISO A5"
+#~ msgstr "ISO A5"
 
 #~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 #~ msgstr "錯誤：ijsgutenprint：�表機必須用 -sDeviceModel �項指定\n"
@@ -8579,16 +12652,9 @@ msgstr "列�中..."
 #~ msgstr "影�寫真光澤膠片"
 
 # (Abel) from Canon
-#~ msgid "Glossy Photo Paper"
-#~ msgstr "影�寫真光澤紙"
-
-# (Abel) from Canon
 #~ msgid "Photo Paper Pro"
 #~ msgstr "專業級相紙"
 
-#~ msgid "CMY Color"
-#~ msgstr "CMY 色系"
-
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK 色系"
 
@@ -8729,9 +12795,6 @@ msgstr "列�中..."
 #~ msgid "Bottom Border:"
 #~ msgstr "底部邊界："
 
-#~ msgid "Media Size:"
-#~ msgstr "紙張尺寸："
-
 #~ msgid "Type of media you're printing to"
 #~ msgstr "列�時使用的紙張尺寸"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index bffccb3..3c0fd16 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -44,7 +44,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -96,6 +97,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -116,6 +118,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -148,6 +151,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -168,9 +172,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -197,6 +202,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 4e85743..e78bcca 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,7 +45,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -88,6 +89,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -108,6 +110,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -140,6 +143,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -160,9 +164,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -189,6 +194,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index c4679e5..f035c46 100644
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -30,7 +30,7 @@ test "$libtool_major" -le 1 && {
 } && {
   echo
   echo "**Warning**: You should have \`libtool' 1.4.3 or newer installed to"
-  echo "create a gutenprint distribution.  Earlier versions of gettext do"
+  echo "create a gutenprint distribution.  Earlier versions of libtool do"
   echo "not generate correct code for all platforms."
   echo "Get ftp://ftp.gnu.org/pub/gnu/libtool/libtool-1.5.tar.gz"
   echo "(or a newer version if it is available)"
@@ -64,7 +64,7 @@ grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`gettext' installed to compile gutenprint."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.11.5.tar.gz"
+    echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.16.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
   }
@@ -89,15 +89,13 @@ gettext_minor=`echo $gettextv | awk -F. '{print $2}'`
 gettext_point=`echo $gettextv | awk -F. '{print $3}'`
 
 test "$gettext_major" -eq 0 && {
-  test "$gettext_minor" -lt 11 || {
-    test "$gettext_minor" -eq 5
-  }
+  test "$gettext_minor" -lt 16
 } && {
   echo
-  echo "**Warning**: You must have \`gettext' 0.11.5 or newer installed to"
+  echo "**Warning**: You must have \`gettext' 0.16 or newer installed to"
   echo "create a gutenprint distribution.  Earlier versions of gettext do"
   echo "not generate the correct 'make uninstall' code."
-  echo "Get ftp://ftp.gnu.org/gnu/gettext/gettext-0.10.40.tar.gz"
+  echo "Get ftp://ftp.gnu.org/gnu/gettext/gettext-0.16.tar.gz"
   echo "(or a newer version if it is available)"
 }
 
@@ -278,9 +276,20 @@ test -z "$convertloc" && {
 }
 
 # Check for docbook version 4
+# Note workaround for Fedora installation
+# Include path for Fedora Docbook. A bit circuitous, but Fedora appends 
+# a bunch of extra stuff to the name of the directory-- including the 
+# version of Fedora (eg -fc9).  We don't want to test for every version 
+# of Fedora and modern bourne shells won't expand the glob (*); 
+# therefore, we do a `find` first and then test to see if there are any 
+# results.
+
+if test -d /usr/share/sgml/docbook ;  then
+  fedora_docbook=`find /usr/share/sgml/docbook -type d -name 'sgml-dtd-4.*' -print`
+fi
 
 {
-  test -d "/usr/share/sgml/docbook_4" || test -d "/usr/share/sgml/docbook/dtd/4.0" || test -d "/usr/share/sgml/docbook_4.1"
+  test -d "/usr/share/sgml/docbook_4" || test -d "/usr/share/sgml/docbook/dtd/4.0" || test -d "/usr/share/sgml/docbook_4.1" || test -n "$fedora_docbook"
 } || {
   echo " "
   echo "***Warning***: You must have "Docbook v4" installed to"
diff --git a/scripts/config.guess b/scripts/config.guess
index ee5232a..e6b5d5b 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-01-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -171,6 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -339,7 +340,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -541,7 +542,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -790,7 +791,7 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -800,12 +801,18 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -839,10 +846,17 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
@@ -960,6 +974,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-${VENDOR}-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1218,6 +1235,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff --git a/scripts/config.rpath b/scripts/config.rpath
index 5ead758..c492a93 100755
--- a/scripts/config.rpath
+++ b/scripts/config.rpath
@@ -2,28 +2,13 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2002 Free Software Foundation, Inc.
+#   Copyright 1996-2006 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
+#   This file is 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.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -34,43 +19,89 @@
 #
 # The set of defined variables is at the end of this script.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-shlibext=
+shrext=.so
 
 host="$1"
 host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
 wl=
 if test "$GCC" = yes; then
   wl='-Wl,'
 else
   case "$host_os" in
-    aix3* | aix4* | aix5*)
+    aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
     hpux9* | hpux10* | hpux11*)
       wl='-Wl,'
       ;;
-    irix5* | irix6*)
+    irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
+    newsos6)
+      ;;
     linux*)
-      echo '__INTEL_COMPILER' > conftest.$ac_ext
-      if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
-      then
-        :
-      else
-        # Intel icc
-        wl='-Qoption,ld,'
-      fi
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
       ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
+    sco3.2v5*)
+      ;;
     solaris*)
       wl='-Wl,'
       ;;
@@ -78,15 +109,20 @@ else
       wl='-Qoption ld '
       ;;
     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      if test "x$host_vendor" = xsni; then
-        wl='-LD'
-      else
-        wl='-Wl,'
-      fi
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
       ;;
   esac
 fi
 
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
 hardcode_direct=no
@@ -101,6 +137,10 @@ case "$host_os" in
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -108,10 +148,18 @@ esac
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
     aix3* | aix4* | aix5*)
-      # On AIX, the GNU linker is very broken
-      ld_shlibs=no
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
       ;;
     amigaos*)
       hardcode_libdir_flag_spec='-L$libdir'
@@ -120,12 +168,12 @@ if test "$with_gnu_ld" = yes; then
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
+      # behavior of shared libraries on other platforms, we cannot use
       # them.
       ld_shlibs=no
       ;;
     beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -135,29 +183,61 @@ if test "$with_gnu_ld" = yes; then
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
       ;;
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
       fi
       ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
     sunos4*)
       hardcode_direct=yes
       ;;
     *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
       fi
       ;;
   esac
-  if test "$ld_shlibs" = yes; then
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
   fi
 else
   case "$host_os" in
@@ -188,6 +268,7 @@ else
               break
             fi
           done
+          ;;
         esac
       fi
       hardcode_direct=yes
@@ -207,15 +288,30 @@ else
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_libdir_separator=
           fi
+          ;;
         esac
       fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
       if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
       else
         if test "$host_cpu" = ia64; then
           hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
         else
-          hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
         fi
       fi
       ;;
@@ -225,6 +321,8 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
+    bsdi[45]*)
+      ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
@@ -234,7 +332,21 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      hardcode_direct=yes
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
       ;;
     freebsd1*)
       ld_shlibs=no
@@ -247,18 +359,46 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
-    hpux9* | hpux10* | hpux11*)
+    hpux9*)
       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
-      hardcode_minus_L=yes # Not in the search PATH, but as the default
-                           # location of the library.
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
       ;;
-    irix5* | irix6*)
+    irix5* | irix6* | nonstopux*)
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
@@ -303,8 +443,6 @@ else
       fi
       hardcode_libdir_separator=:
       ;;
-    sco3.2v5*)
-      ;;
     solaris*)
       hardcode_libdir_flag_spec='-R$libdir'
       ;;
@@ -314,33 +452,33 @@ else
       hardcode_minus_L=yes
       ;;
     sysv4)
-      if test "x$host_vendor" = xsno; then
-        hardcode_direct=yes # is this really true???
-      else
-        hardcode_direct=no # Motorola manual says yes, but my tests say they lie
-      fi
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
       ;;
     sysv4.3*)
       ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
         ld_shlibs=yes
       fi
       ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
       ;;
-    sysv5uw7* | unixware7*)
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
       ;;
     *)
       ld_shlibs=no
@@ -349,136 +487,105 @@ else
 fi
 
 # Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
 libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 case "$host_os" in
   aix3*)
-    shlibext=so
     ;;
   aix4* | aix5*)
-    shlibext=so
     ;;
   amigaos*)
-    shlibext=ixlibrary
     ;;
   beos*)
-    shlibext=so
     ;;
-  bsdi4*)
-    shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  bsdi[45]*)
     ;;
   cygwin* | mingw* | pw32*)
-    case $GCC,$host_os in
-      yes,cygwin*)
-        shlibext=dll.a
-        ;;
-      yes,mingw*)
-        shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-        ;;
-      yes,pw32*)
-        shlibext=dll
-        ;;
-      *)
-        shlibext=dll
-        ;;
-    esac
+    shrext=.dll
     ;;
   darwin* | rhapsody*)
-    shlibext=dylib
+    shrext=.dylib
+    ;;
+  dgux*)
     ;;
   freebsd1*)
     ;;
-  freebsd*)
-    shlibext=so
+  kfreebsd*-gnu)
+    ;;
+  freebsd* | dragonfly*)
     ;;
   gnu*)
-    shlibext=so
     ;;
   hpux9* | hpux10* | hpux11*)
-    shlibext=sl
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
     ;;
-  irix5* | irix6*)
-    shlibext=so
+  interix3*)
+    ;;
+  irix5* | irix6* | nonstopux*)
     case "$host_os" in
-      irix5*)
+      irix5* | nonstopux*)
         libsuff= shlibsuff=
         ;;
       *)
         case $LD in
-          *-32|*"-32 ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
           *) libsuff= shlibsuff= ;;
         esac
         ;;
     esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
     ;;
-  linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
     ;;
-  linux-gnu*)
-    shlibext=so
+  knetbsd*-gnu)
     ;;
   netbsd*)
-    shlibext=so
     ;;
   newsos6)
-    shlibext=so
+    ;;
+  nto-qnx*)
     ;;
   openbsd*)
-    shlibext=so
     ;;
   os2*)
     libname_spec='$name'
-    shlibext=dll
+    shrext=.dll
     ;;
   osf3* | osf4* | osf5*)
-    shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-    ;;
-  sco3.2v5*)
-    shlibext=so
     ;;
   solaris*)
-    shlibext=so
     ;;
   sunos4*)
-    shlibext=so
     ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
+  sysv4 | sysv4.3*)
     ;;
-  uts4*)
-    shlibext=so
+  sysv4*MP*)
     ;;
-  dgux*)
-    shlibext=so
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
     ;;
-  sysv4*MP*)
-    if test -d /usr/nec; then
-      shlibext=so
-    fi
+  uts4*)
     ;;
 esac
 
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"
@@ -504,10 +611,4 @@ hardcode_direct="$hardcode_direct"
 # resulting binary.
 hardcode_minus_L="$hardcode_minus_L"
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
 EOF
diff --git a/scripts/config.sub b/scripts/config.sub
index fab0aa3..6759825 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-09-20'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -475,8 +487,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -668,6 +680,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -683,6 +703,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -809,6 +833,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -925,6 +957,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1014,6 +1049,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1219,7 +1258,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1453,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff --git a/scripts/depcomp b/scripts/depcomp
index ca5ea4e..e5f9736 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
diff --git a/scripts/global.mk b/scripts/global.mk
index 0aa97b9..ed4233a 100644
--- a/scripts/global.mk
+++ b/scripts/global.mk
@@ -4,7 +4,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 
diff --git a/scripts/install-sh b/scripts/install-sh
index 4fbbae7..a5897de 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,34 +58,49 @@ fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-posix_glob=
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        shift
-        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
-        continue;;
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -165,21 +170,22 @@ while test $# -ne 0; do
 
     *)  break;;
   esac
+  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
   # Otherwise, the last argument is the destination.  Remove it from $@.
   for arg
   do
-    if test -n "$dstarg"; then
+    if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
+      set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
-    dstarg=$arg
+    dst_arg=$arg
   done
 fi
 
@@ -224,7 +230,7 @@ for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
       dstdir=$dst
@@ -378,26 +384,19 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
       esac
 
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
+      eval "$initialize_posix_glob"
 
       oIFS=$IFS
       IFS=/
-      $posix_glob && set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      $posix_glob && set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
@@ -459,41 +458,54 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
 
     trap '' 0
   fi
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index 4598ec6..27d498a 100644
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -2,7 +2,7 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -113,15 +113,21 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
 	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
 	  $lt_var=C
 	  export $lt_var
 	fi"
 done
 
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
+
 # Make sure IFS has a sensible default
 lt_nl='
 '
@@ -485,7 +491,7 @@ do
     echo "\
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2008  Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
@@ -788,6 +794,7 @@ if test -z "$show_help"; then
     *.for) xform=for ;;
     *.java) xform=java ;;
     *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -956,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1028,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1161,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1646,6 +1654,11 @@ EOF
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -2149,7 +2162,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2945,12 +2963,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3098,9 +3122,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -4237,9 +4262,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -6478,7 +6504,7 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
 	eval "if test \"\${save_$lt_var+set}\" = set; then
 		$lt_var=\$save_$lt_var; export $lt_var
diff --git a/scripts/mkchlog b/scripts/mkchlog
index f6d9a45..fa54b5d 100755
--- a/scripts/mkchlog
+++ b/scripts/mkchlog
@@ -5,23 +5,35 @@
 # This code is in the public domain and may be used
 # for any purpose.
 
+use Getopt::Long;
+Getopt::Long::Configure("bundling", "no_ignore_case", "pass_through");
+
+use strict;
+
 # Configuration options.
-$emailsuffix = '@sourceforge.net';
-$symbolic_name_regexp = '^(guten|gimp-|)print-[0-9]+_';
+my $emailsuffix;
+my $symbolic_name_regexp;
+my (@ignoreprefix);
+
+GetOptions("e:s" => \$emailsuffix,
+	   "X=s" => \@ignoreprefix,
+	   "s:s" => \$symbolic_name_regexp);
 
-%logmsgs = ();			# Index by date, time, and author
-%fileversions = ();
-$skipme = 0;
-%basenames = ();
+my %logmsgs = ();			# Index by date, time, and author
+my %fileversions = ();
+my $skipme = 0;
+my %basenames = ();
+my %plus = ();
+my %minus = ();
 
-@cvsdirs=`find . -type d -name CVS -print`;
-map { chomp; s,^\./,, } @cvsdirs;
-foreach $d (@cvsdirs) {
+my @cvsdirs=`find . -type d -name CVS -print`;
+@cvsdirs = map { chomp; s,^\./,, } @cvsdirs;
+foreach my $d (@cvsdirs) {
     if (open ENTRIES, "$d/Entries") {
-	local ($rootdir) = $d;
+	my ($rootdir) = $d;
 	$rootdir =~ s/CVS$//;
 	while (<ENTRIES>) {
-	    local ($type, $file, $version, @junk) = split /\//;
+	    my ($type, $file, $version, @junk) = split /\//;
 	    if ($type eq "") {
 		$basenames{"$file"} = "1";
 		$file = "$rootdir$file";
@@ -126,6 +138,7 @@ my ($in_header) = 0;
 my (%symbols);
 my $revision;
 my $ignore;
+my ($skipfile);
 my $currentfile;
 my $currentbasefile;
 my %symbols_printed = ();
@@ -135,6 +148,12 @@ while (<>) {
 	$in_header = 1;
 	chomp;
 	($ignore, $ignore, $currentfile) = split;
+	if (grep { $currentfile =~ /^$_/ } @ignoreprefix) {
+	    $skipfile = 1;
+	} else {
+	    $skipfile = 0;
+	}
+	$symbols{$currentfile} = {};
 	next;
     } elsif ($in_header && $_ =~ /^symbolic names:/) {
 	while (<>) {
@@ -196,12 +215,15 @@ while (<>) {
 		$firstline = 0;
 	    }
 	}
-	$junkbody = $body;
+	my $junkbody = $body;
 	$junkbody =~ s/\s//g;
 	$junkbody .= "x";
-	my $symbols = join " ", @{$symbols{$currentfile}{$revision}};
+	my $symbols;
+	if (defined $symbols{$currentfile}{$revision}) {
+	    $symbols = join " ", @{$symbols{$currentfile}{$revision}};
+	}
 	my $datetimeauthor = "$date $time $author $junkbody $currentfile $revision $symbols";
-	if ($skipme == 0) {
+	if ($skipfile == 0 && $skipme == 0) {
 	    $logmsgs{$datetimeauthor} = $body;
 	    if ($plus eq "") {
 		$plus{$datetimeauthor} = "added";
@@ -215,17 +237,19 @@ while (<>) {
     }				# Other junk we ignore
 }
 
-$prevmsg="";
-$header="";
-@fileinfo = ();
+my $prevmsg="";
+my $header="";
+my @fileinfo = ();
 
-@chlog = reverse sort keys %logmsgs;
-%filenames_printed = ();
+my @chlog = reverse sort keys %logmsgs;
+my %filenames_printed = ();
+my ($date, $time, $author, $junk, $file, $revision, @symbols);
+my $filestuff;
 
-foreach $_ (@chlog) {
-    my ($date, $time, $author, $junk, $file, $revision, @symbols) = split;
+foreach (@chlog) {
+    ($date, $time, $author, $junk, $file, $revision, @symbols) = split;
     $date =~ s,/,-,g;
-    $msg = $logmsgs{$_};
+    my $msg = $logmsgs{$_};
     my $delta;
     if (! $minus{$_}) {
 	$delta = "$plus{$_}";
diff --git a/scripts/ylwrap b/scripts/ylwrap
index 102bd89..7278b6a 100755
--- a/scripts/ylwrap
+++ b/scripts/ylwrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2005-05-14.22
+scriptversion=2007-11-22.22
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+# 2007  Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -101,14 +101,14 @@ esac
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
 
 case $# in
-  0) $prog "$input" ;;
-  *) $prog "$@" "$input" ;;
+  0) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
 esac
 ret=$?
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fc635f1..2123bad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.20 2006/09/18 02:31:57 rlk Exp $
+## $Id: Makefile.am,v 1.22 2008/06/14 02:45:19 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,8 @@ include $(top_srcdir)/scripts/global.mk
 
 SUBDIRS = 					\
 	main					\
-	gutenprintui2			\
+	xml					\
+	gutenprintui2				\
 	escputil				\
 	gimp2					\
 	cups					\
diff --git a/src/Makefile.in b/src/Makefile.in
index 77e3e94..afa9459 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,7 +43,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -98,6 +99,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -118,6 +120,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -150,6 +153,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -170,9 +174,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -199,6 +204,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -270,7 +276,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS
 GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 SUBDIRS = \
 	main					\
-	gutenprintui2			\
+	xml					\
+	gutenprintui2				\
 	escputil				\
 	gimp2					\
 	cups					\
@@ -393,8 +400,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -419,8 +426,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +437,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/cups/Info.plist.in b/src/cups/Info.plist.in
new file mode 100644
index 0000000..c89a5dd
--- /dev/null
+++ b/src/cups/Info.plist.in
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+        <key>CFBundleDisplayName</key>
+        <string>Gutenprint</string>
+	<key>CFBundleExecutable</key>
+	<string>rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@</string>
+        <key>CFBundleGetInfoString</key>
+        <string>@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@, Copyright 1993-2008 Mike Sweet and Robert Krawitz</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.cups.gutenprint</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+        <key>CFBundleName</key>
+        <string>Gutenprint</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@</string>
+</dict>
+</plist>
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index 0331e80..c093bde 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.96 2008/04/06 01:10:52 rlk Exp $
+## $Id: Makefile.am,v 1.118 2008/09/22 03:10:45 easysw Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -45,14 +45,20 @@ endif
 
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
 
-STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml STP_LOCALEDIR=$(top_srcdir)/src/cups/catalog
 
 ## Programs
 
 if BUILD_TRANSLATED_CUPS_PPDS
-PPD_NLS = $(PPD_NLS_1)
+if BUILD_GLOBALIZED_CUPS_PPDS
+PPD = ppd-global
+else
+PPD = $(PPD_NLS_1)
+endif
 LINGUAS = $(ALL_LINGUAS)
 TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
+else
+PPD = ppd-nonls
 endif
 
 if BUILD_SIMPLIFIED_CUPS_PPDS
@@ -86,18 +92,18 @@ commandtocanon_LDADD = $(CUPS_LIBS)
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
 
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+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@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
+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
+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@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+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
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
 ## Data
@@ -121,8 +127,6 @@ PPD_NLS_1 = ppd-nls
 endif
 
 
-## Rules
-
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	if test -n "$(CUPS_PKG)" -a -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	  $(mkdir_p) $(DESTDIR)$(cups_modeldir); \
@@ -137,14 +141,24 @@ install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	  cd ..; \
 	  done \
 	fi
+	$(mkdir_p) "$(DESTDIR)$(localedir)"
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "$(DESTDIR)$(localedir)/$$lang"; \
+	  $(INSTALL_DATA) $$file "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 uninstall-local: $(INSTALL_DATA_LOCAL_DEPS)
 # Remove PPDs installed in new PPD location
 	if test -z "DONT_UNINSTALL_PPDS" ; then \
 	  if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	    $(RM) -fr $(DESTDIR)$(cups_modeldir)/* ; \
-	  fi \
+	  fi ; \
 	fi
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(RM) "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 install-data-hook:
 # Remove unused directories in install tree
@@ -167,34 +181,47 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 ppd: ppd-stamp
 
-ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
-ppd-stamp-phony: ppd-stamp-pre ppd-nonls $(PPD_NLS)
+ppd-stamp-phony: ppd-stamp-pre $(PPD)
 
 ppd-stamp-pre:
 	-$(RM) -r ppd
-	-mkdir ppd
 
-ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	for language in C ; 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@ -p ppd/$$language ; \
+ppd-catalog:
+	$(mkdir_p) catalog
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "catalog/$$lang"; \
+	  $(INSTALL_DATA) $$file "catalog/$$lang/gutenprint_$$lang.po"; \
 	done
 
-ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	wdir=`pwd` ; \
-	cd $(top_builddir)/po ; \
-	$(MAKE) ; \
-	$(MAKE) DESTDIR= prefix=$${wdir}/catalog datadir=$${wdir}/catalog/share install
-	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
+ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
+	$(mkdir_p) ppd/C
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l C -p ppd/C
+
+ppd-global: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs:"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global
+	-$(RM) -r catalog
+
+ppd-global-ln: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs (localized numbers for testing):"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global -N
+	-$(RM) -r catalog
+
+ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog ppd-nonls
+	$(mkdir_p) ppd
+	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 -c `pwd`/catalog/share/locale ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language; \
 	done
-	$(RM) -r catalog
+	-$(RM) -r catalog
 
 dist-hook:
 	for dir in commands ; do \
@@ -227,3 +254,4 @@ EXTRA_DIST = \
 	test-ppds
 
 
+
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index fd5895c..4bbd121 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 
@@ -37,8 +37,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/cups-genppdupdate.in \
+DIST_COMMON = README $(srcdir)/Info.plist.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/cups-genppdupdate.in \
 	$(srcdir)/test-rastertogutenprint.in \
 	$(top_srcdir)/scripts/global.mk COPYING
 @BUILD_CUPS_1_2_TRUE@cupsexec_driver_PROGRAMS = gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
@@ -52,7 +52,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -60,7 +61,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = cups-genppdupdate test-rastertogutenprint
+CONFIG_CLEAN_FILES = Info.plist cups-genppdupdate \
+	test-rastertogutenprint
 am__installdirs = "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(cupsexec_driverdir)" \
 	"$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" \
@@ -82,7 +84,8 @@ commandtoepson_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_cups_calibrate_OBJECTS = cups-calibrate.$(OBJEXT)
 cups_calibrate_OBJECTS = $(am_cups_calibrate_OBJECTS)
 cups_calibrate_DEPENDENCIES =
-am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT)
+am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT) \
+	cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.$(OBJEXT)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
@@ -93,7 +96,8 @@ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
 	$(CFLAGS) \
 	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT)
+am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT) \
+	gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.$(OBJEXT)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
@@ -105,7 +109,7 @@ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
 	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS =  \
-	rastertoprinter.$(OBJEXT)
+	rastertoprinter.$(OBJEXT) i18n.$(OBJEXT)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) $(GUTENPRINT_LIBS)
@@ -116,7 +120,7 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =
 	$(LDFLAGS) -o $@
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -183,6 +187,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -203,6 +208,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -235,6 +241,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -255,9 +262,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = cups
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -284,6 +292,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -361,8 +370,10 @@ cupsexec_filterdir = $(pkglibdir)/filter
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(pkgdatadir)/model/
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@DONT_UNINSTALL_PPDS = true
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
-STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
-@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD_NLS = $(PPD_NLS_1)
+STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml STP_LOCALEDIR=$(top_srcdir)/src/cups/catalog
+@BUILD_GLOBALIZED_CUPS_PPDS_FALSE@@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD = $(PPD_NLS_1)
+@BUILD_GLOBALIZED_CUPS_PPDS_TRUE@@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD = ppd-global
+@BUILD_TRANSLATED_CUPS_PPDS_FALSE@PPD = ppd-nonls
 @BUILD_TRANSLATED_CUPS_PPDS_TRUE@LINGUAS = $(ALL_LINGUAS)
 @BUILD_TRANSLATED_CUPS_PPDS_TRUE@TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
 @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@BUILD_SIMPLE_PPDS = -DGENERATE_SIMPLIFIED_PPDS
@@ -376,16 +387,16 @@ commandtocanon_SOURCES = commandtocanon.c
 commandtocanon_LDADD = $(CUPS_LIBS)
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+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@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
+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
+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@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+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
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 @BUILD_CUPS_TRUE@CUPS_PKG = calibrate.ppm
 @BUILD_CUPS_TRUE@CUPS_CONF = command.types
@@ -437,6 +448,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Info.plist: $(top_builddir)/config.status $(srcdir)/Info.plist.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 cups-genppdupdate: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 test-rastertogutenprint: $(top_builddir)/config.status $(srcdir)/test-rastertogutenprint.in
@@ -450,8 +463,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -478,8 +491,8 @@ install-cupsexec_driverPROGRAMS: $(cupsexec_driver_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_driverdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_driverdir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_driverdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_driverdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -506,8 +519,8 @@ install-cupsexec_filterPROGRAMS: $(cupsexec_filter_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_filterdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_filterdir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_filterdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cupsexec_filterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_filterdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -534,8 +547,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -601,7 +614,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtoepson.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups-calibrate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i18n.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@
 
 .c.o:
@@ -639,6 +655,20 @@ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj: ge
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`
 
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o -MD -MP -MF $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj -MD -MP -MF $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o: genppd.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o -MD -MP -MF $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o `test -f 'genppd.c' || echo '$(srcdir)/'`genppd.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po
@@ -653,6 +683,20 @@ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj: gen
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`
 
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o -MD -MP -MF $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.o `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
+
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj: i18n.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj -MD -MP -MF $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Tpo $(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i18n.c' object='gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-i18n.obj `if test -f 'i18n.c'; then $(CYGPATH_W) 'i18n.c'; else $(CYGPATH_W) '$(srcdir)/i18n.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -698,8 +742,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -711,8 +755,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -722,13 +766,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -1003,14 +1046,24 @@ install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	  cd ..; \
 	  done \
 	fi
+	$(mkdir_p) "$(DESTDIR)$(localedir)"
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "$(DESTDIR)$(localedir)/$$lang"; \
+	  $(INSTALL_DATA) $$file "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 uninstall-local: $(INSTALL_DATA_LOCAL_DEPS)
 # Remove PPDs installed in new PPD location
 	if test -z "DONT_UNINSTALL_PPDS" ; then \
 	  if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	    $(RM) -fr $(DESTDIR)$(cups_modeldir)/* ; \
-	  fi \
+	  fi ; \
 	fi
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(RM) "$(DESTDIR)$(localedir)/$$lang/gutenprint_$$lang.po"; \
+	done
 
 install-data-hook:
 # Remove unused directories in install tree
@@ -1033,34 +1086,47 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 ppd: ppd-stamp
 
-ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
-ppd-stamp-phony: ppd-stamp-pre ppd-nonls $(PPD_NLS)
+ppd-stamp-phony: ppd-stamp-pre $(PPD)
 
 ppd-stamp-pre:
 	-$(RM) -r ppd
-	-mkdir ppd
 
-ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	for language in C ; 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@ -p ppd/$$language ; \
+ppd-catalog:
+	$(mkdir_p) catalog
+	for file in $(srcdir)/../../po/*.po; do \
+	  lang=`basename $$file .po`; \
+	  $(mkdir_p) "catalog/$$lang"; \
+	  $(INSTALL_DATA) $$file "catalog/$$lang/gutenprint_$$lang.po"; \
 	done
 
-ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-	wdir=`pwd` ; \
-	cd $(top_builddir)/po ; \
-	$(MAKE) ; \
-	$(MAKE) DESTDIR= prefix=$${wdir}/catalog datadir=$${wdir}/catalog/share install
-	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
+ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
+	$(mkdir_p) ppd/C
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l C -p ppd/C
+
+ppd-global: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs:"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global
+	-$(RM) -r catalog
+
+ppd-global-ln: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog
+	$(mkdir_p) ppd/Global
+	@echo "Global PPDs (localized numbers for testing):"
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global -N
+	-$(RM) -r catalog
+
+ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-catalog ppd-nonls
+	$(mkdir_p) ppd
+	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 -c `pwd`/catalog/share/locale ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language; \
 	done
-	$(RM) -r catalog
+	-$(RM) -r catalog
 
 dist-hook:
 	for dir in commands ; do \
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 9892ce0..48324ee 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.42 2008/04/12 01:20:33 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.53 2008/09/22 11:04:24 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -20,8 +20,6 @@
 use strict;
 use Getopt::Std;
 use Fcntl qw(:mode);
-use File::Temp qw(:POSIX);
-use File::Copy qw(mv);
 
 sub parse_options ();
 sub update_ppd ($); # Original PPD filename
@@ -43,6 +41,7 @@ our $opt_o; # Output directory
 our $opt_r; # Gutenprint version
 our $opt_i; # Interactive
 our $opt_f; # Force upgrade
+our $opt_l; # Language
 
 my $debug = 0;
 my $verbose = 0;   # Verbose output
@@ -64,6 +63,7 @@ my $updated_ppd_count = 0;
 my $skipped_ppd_count = 0;
 my $failed_ppd_count = 0;
 my $exit_after_parse_args = 0;
+my @languages = qw(Global C @ALL_LINGUAS@);
 
 my $serverdir = "@cups_conf_serverbin@";
 my $driver_bin = "$serverdir/driver/gutenprint.$version";
@@ -170,7 +170,11 @@ 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}.  Restart cupsd for the changes to take effect.\n";
+	print STDOUT "Updated $updated_ppd_count PPD file${plural}.";
+	if (!defined $opt_o || $opt_o ne "") {
+	    print STDOUT "Restart cupsd for the changes to take effect.";
+	}
+	print STDOUT "\n";
     } else {
 	if ($failed_ppd_count > 0) {
 	    print STDOUT "Failed to update any PPD files\n";
@@ -198,6 +202,10 @@ sub HELP_MESSAGE($;$$$) {
     print $fh "  -r version  Use PPD files for Gutenprint major.minor version.\n";
     print $fh "  -f          Ignore new PPD file safety checks.\n";
     print $fh "  -i          Prompt (interactively) for each PPD file.\n";
+    print $fh "  -l language Language choice (Gutenprint 5.1 or below).\n";
+    print $fh "              Choices: " . join(" ", @languages) . "\n";
+    print $fh "              Or -loriginal to preserve original language\n";
+    print $fh "                 with Gutenprint 5.2 or above\n";
     exit(0);
 }
 
@@ -216,7 +224,7 @@ sub help() {
 }
 
 sub parse_options () {
-    if (!getopts('d:hnqs:vNo:p:P:r:if')) {
+    if (!getopts('d:hnqs:vNo:p:P:r:ifl:')) {
 	help();
     }
     if ($opt_n) {
@@ -251,6 +259,7 @@ sub parse_options () {
 		if (-d $opt_s) {
 		    $ppd_base_dir = "$opt_s";
 		    $driver_bin = "";
+		    $use_static_ppd = "yes";
 		} else {
 		    die "$opt_s: invalid directory: $!\n";
 		}
@@ -264,6 +273,7 @@ sub parse_options () {
 	    $file_version = "\"$version";
 	    if (-x $driver_bin) {
 		$driver_version = `$driver_bin VERSION`;
+		$use_static_ppd = "no";
 		chomp $driver_version;
 		$file_version = "\"$driver_version\"\$";
 	    } elsif (! -d $ppd_base_dir && ! -l $ppd_base_dir) {
@@ -276,6 +286,7 @@ sub parse_options () {
 	    $ppd_base_dir = "$opt_s";
 	    $driver_bin = "";
 	    $driver_version = "";
+	    $use_static_ppd = "yes";
 	}
 	else {
 	    die "$opt_s: invalid directory: $!\n";
@@ -292,6 +303,9 @@ sub parse_options () {
     if ($opt_P) {
 	if (-x $opt_P) {
 	    $driver_bin = "$opt_P";
+	    $driver_version = `$driver_bin VERSION`;
+	    chomp $driver_version;
+	    $use_static_ppd = "no";
 	}
 	else {
 	    die "$opt_P: invalid executable: $!\n";
@@ -300,6 +314,10 @@ sub parse_options () {
     if ($opt_h) {
 	help();
     }
+    if ($opt_l && lc $opt_l ne "original" && ! grep { $_ eq $opt_l } @languages) {
+	print STDERR "Unknown language '$opt_l'\n";
+	help();
+    }
     if ($opt_i) {
 	$interactive = 1;
     }
@@ -326,7 +344,9 @@ sub get_ppd_fh($$$$$) {
 	}
 	my ($url);
 	my (@url_list);
-	if ($locale) {
+	if (((defined $opt_r && $opt_r < 5.2) ||
+	     (defined $opt_l && $opt_l ne "")) &&
+	    $locale ne "") {
 	    if ($region) {
 		push @url_list, "gutenprint.$version://$driver/$simplified/${locale}_${region}";
 	    }
@@ -393,11 +413,13 @@ sub update_ppd ($) {
     my ($lingo) = "";
     my ($region) = "";
     my ($valid) = 0;
+    my ($orig_locale) = "";
     while (<ORIG>) {
 	if (/\*StpLocale:/) {
-	    ($locale) = m/^\*StpLocale:\s\"*(.*)\"$/;
+	    ($locale) = m/^\*StpLocale:\s*\"(.*)\"$/;
+	    $orig_locale = $locale;
 	    $valid = 1;
-	} elsif (/\*LanguageVersion/) {
+	} elsif (/^\*LanguageVersion/) {
 	    ($lingo) = m/^\*LanguageVersion:\s*(.*)$/;
 	} elsif (/^\*StpDriverName:/ ) {
 	    ($driver) = m/^\*StpDriverName:\s*\"(.*)\"$/;
@@ -421,18 +443,26 @@ sub update_ppd ($) {
 #	print STDERR "Skipping $ppd_source_filename: not a Gutenprint PPD file\n";
 	return -1;
     }
+    if (defined $opt_l && $opt_l ne "" && lc $opt_l ne "original") {
+	$locale = $opt_l;
+	$orig_locale = $locale;
+    }
     if ($debug & 2) {
 	print "Gutenprint Filename: $filename\n";
-	print "Locale: $locale\n";
+	if ($opt_l) {
+	    print "Locale: $locale (from -l)\n";
+	} else {
+	    print "Locale: $locale\n";
+	}
 	print "Language: $lingo\n";
 	print "Driver: $driver\n";
     }
     if ($locale) {
 	# Split into the language and territory.
-	($locale, $region) = split(/-/, $locale);
+	($locale, $region) = split(/_/, $locale);
     } else {
 	# Split into the language and territory.
-	($locale, $region) = split(/-/, $lingo);
+	($locale, $region) = split(/_/, $lingo);
 	# Convert language into language code.
 	$locale = $languagemappings{"\L$lingo"};
 	if (!defined($locale)) {
@@ -475,7 +505,7 @@ sub update_ppd ($) {
 
     seek(ORIG, 0, 0);
 
-    my ($odt, $oopt, $ores, $odef) = get_ppd_data(ORIG, 1, 0, 0, 1, 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...
@@ -492,6 +522,14 @@ sub update_ppd ($) {
     my %new_defaults = %$ndef;
     my %options = %$nopt;
     my %resolution_map = %$nres;
+    my %old_resolution_map = reverse %$ores;
+
+    # Store previous language in the PPD file so that -l original works
+    # correctly.
+
+    if ($orig_locale ne "") {
+	$source_data =~ s/(\*StpLocale:\s*\")(.*)(\")/$1$orig_locale$3/;
+    }
 
     if ($debug & 4) {
 	print "Options (Old->New Default Type):\n";
@@ -518,7 +556,13 @@ sub update_ppd ($) {
 	if (keys %resolution_map) {
 	    print "Resolution Map:\n";
 	    foreach (sort keys %resolution_map) {
-		print "$_: $resolution_map{$_}\n";
+		print "   $_: $resolution_map{$_}\n";
+	    }
+	}
+	if (keys %old_resolution_map) {
+	    print "Old Resolution Map:\n";
+	    foreach (sort keys %old_resolution_map) {
+		print "   $_: $old_resolution_map{$_}\n";
 	    }
 	}
 	print "Non-UI Defaults:\n";
@@ -576,16 +620,31 @@ default_loop:
 		# Check the old setting is valid
 		foreach my $opt (@{$options{$option}}) {
 		    my $def_option = $default_option_value;
-		    if (($def_option eq $opt) ||
-			($option eq "Resolution" &&
-			 (defined $resolution_map{$default_option_value}) &&
-			 ($def_option = $resolution_map{$default_option_value}) eq $opt)) { # Valid option
-			# Set the option in the new PPD
-			$source_data =~ s/\*($default_option).*/*$1:$def_option/m;
-			if ($verbose) {
-			    print "$ppd_source_filename: Set *$default_option to $def_option\n";
+		    my $odef_option = $def_option;
+		    if ($option eq "Resolution" &&
+			defined $old_resolution_map{$def_option}) {
+			if ($debug & 4) {
+			    print "Intermapping old resolution $def_option to $old_resolution_map{$def_option}\n";
+			}
+			$def_option = $old_resolution_map{$def_option};
+		    }
+		    my @dopts = ($def_option);
+		    if ($def_option ne $odef_option) {
+			push @dopts, $odef_option;
+		    }
+
+		    foreach my $dopt (@dopts) {
+			if (($dopt eq $opt) ||
+			    ($option eq "Resolution" &&
+			     (defined $resolution_map{$dopt}) &&
+			     ($dopt = $resolution_map{$dopt}) eq $opt)) { # Valid option
+			    # Set the option in the new PPD
+			    $source_data =~ s/^\*($default_option).*/*$1:$dopt/m;
+			    if ($verbose) {
+				print "$ppd_source_filename: Set *$default_option to $dopt\n";
+			    }
+			    next default_loop;
 			}
-			next default_loop;
 		    }
 		}
 		warn "Warning: $ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Using default setting $new_defaults{$default_option}.\n";
@@ -664,6 +723,7 @@ sub find_ppd ($$$$) {
 	push @lingos, "C/";
     }
     push @lingos, "en/", "";
+    push @lingos, "Global/";
     my (@bases);
     push @bases, "stp-${drivername}.$version${simplified}";
     push @bases, "${drivername}.$version${simplified}";
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 8df934f..2325fbd 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: genppd.c,v 1.142 2008/04/06 21:16:08 rlk Exp $"
+ * "$Id: genppd.c,v 1.170 2008/09/25 23:41:00 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
- *   Copyright 1993-2007 by Easy Software Products and Robert Krawitz.
+ *   Copyright 1993-2008 by Mike Sweet and Robert Krawitz.
  *
  *   This program is free software; you can redistribute it and/or modify it
  *   under the terms of the GNU General Public License as published by the Free
@@ -32,7 +32,6 @@
  *   print_group_open()  - Open a new UI group.
  *   printlangs()        - Print list of available translations.
  *   printmodels()       - Print a list of available models.
- *   set_language()      - Set the current translation language.
  *   usage()             - Show program usage.
  *   write_ppd()         - Write a PPD file.
  */
@@ -80,26 +79,18 @@ static const char *gzext = "";
 #include <cups/cups.h>
 #include <cups/raster.h>
 
-#include <gutenprint/gutenprint.h>
-#include <gutenprint/gutenprint-intl.h>
+#include "i18n.h"
 
 /*
- * Some of the Gutenprint resolution names are not PPD-compliant.
- * In Gutenprint 5.0, use the legacy names with the CUPS 1.1 interface
- * for back compatibility.  With CUPS 1.2, or Gutenprint 5.1 or above,
- * generate compliant names.
- *
- * As of Gutenprint 5.0.2 and 5.1.4, *always* use the compliant names.
- * OS X Leopard seems to be very unhappy if there are invalid resolution
- * names.  We've added a mapping between the invalid names and the
- * valid names so that genppdupdate knows how to translate the names.
+ * Some applications use the XxYdpi tags rather than the actual
+ * hardware resolutions to decide what resolution to print at.  Some
+ * applications get very unhappy if the vertical resolution exceeds
+ * a certain amount.  Some of those applications even get very happy if
+ * the PPD file even contains a resolution that exceeds that limit.
+ * Feh.
  */
-
-#if 0
-#if defined(CUPS_DRIVER_INTERFACE) || (STP_MAJOR_VERSION > 5) || (STP_MAJOR_VERSION == 5 && STP_MINOR_VERSION > 0)
-#define USE_COMPLIANT_RESOLUTIONS 1
-#endif
-#endif
+#define MAXIMUM_SAFE_PPD_Y_RESOLUTION (720)
+#define MAXIMUM_SAFE_PPD_X_RESOLUTION (1500)
 
 /*
  * Note:
@@ -109,6 +100,7 @@ static const char *gzext = "";
  */
 
 int cups_ppd_ps_level = CUPS_PPD_PS_LEVEL;
+int localize_numbers = 0;
 
 /*
  * File handling stuff...
@@ -140,20 +132,27 @@ const char *special_options[] =
   NULL
 };
 
+/*
+ * TRANSLATORS:
+ * Please keep these translated names SHORT.  The number of bytes in
+ * the parameter class name plus the number of bytes in the parameter
+ * name must not exceed 38 BYTES (not characters!)
+ */
+
 const char *parameter_class_names[] =
 {
-  N_("Printer Features"),
-  N_("Output Control")
+  _("Printer Features"),
+  _("Output Control")
 };
 
 const char *parameter_level_names[] =
 {
-  N_("Common"),
-  N_("Extra 1"),
-  N_("Extra 2"),
-  N_("Extra 3"),
-  N_("Extra 4"),
-  N_("Extra 5")
+  _("Common"),
+  _("Extra 1"),
+  _("Extra 2"),
+  _("Extra 3"),
+  _("Extra 4"),
+  _("Extra 5")
 };
 
 
@@ -173,47 +172,18 @@ static void	printlangs(char** langs);
 static void	printmodels(int verbose);
 static void	usage(void);
 #endif /* !CUPS_DRIVER_INTERFACE */
-#ifdef ENABLE_NLS
 static char	**getlangs(void);
-static void	set_language(const char *lang);
-#endif /* ENABLE_NLS */
 static int	is_special_option(const char *name);
 static void	print_group_close(gzFile fp, stp_parameter_class_t p_class,
-				  stp_parameter_level_t p_level);
+				  stp_parameter_level_t p_level,
+				  const char *language, stp_string_list_t *po);
 static void	print_group_open(gzFile fp, stp_parameter_class_t p_class,
-				 stp_parameter_level_t p_level);
+				 stp_parameter_level_t p_level,
+				 const char *language, stp_string_list_t *po);
 static int	write_ppd(gzFile fp, const stp_printer_t *p,
 		          const char *language, const char *ppd_location,
 			  int simplified);
 
-#ifdef ENABLE_NLS
-
-typedef struct {
-  const char *lang;
-  const char *mapping;
-} locale_map;
-
-static const locale_map lang_mappings[] =
-  {
-    { "cs", "CS_CZ" },
-    { "da", "da_DK" },
-    { "de", "de_DE" },
-    { "el", "el_GR" },
-    { "es", "es_ES" },
-    { "fr", "fr_FR" },
-    { "hu", "hu_HU" },
-    { "ja", "ja_JP" },
-    { "nb", "nb_NO" },
-    { "nl", "nl_NL" },
-    { "pl", "pl_PL" },
-    { "pt", "pt_PT" },
-    { "sk", "sk_SK" },
-    { "sv", "sv_SE" },
-  };
-static int lang_map_count = sizeof(lang_mappings) / sizeof(locale_map);
-
-static const char *baselocaledir = PACKAGE_LOCALE_DIR;
-#endif
 
 /*
  * Global variables...
@@ -274,14 +244,12 @@ cat_ppd(int argc, char **argv)	/* I - Driver URI */
   int			port;		/* URI port (unused) */
   http_uri_status_t	status;		/* URI decode status */
   const stp_printer_t	*p;		/* Printer driver */
-  const char		*lang = "C";
+  const char		*lang = NULL;
   char			*s;
-#ifdef ENABLE_NLS
-  char			**all_langs = getlangs();
-#endif
   char			filename[1024],		/* Filename */
 			ppd_location[1024];	/* Installed location */
 
+
   if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri,
                                 scheme, sizeof(scheme),
                                 userpass, sizeof(userpass),
@@ -306,24 +274,6 @@ cat_ppd(int argc, char **argv)	/* I - Driver URI */
       *s = '\0';
     }
 
-#ifdef ENABLE_NLS
-  if (!lang || strcmp(lang, "C") != 0)
-    {
-      while (*all_langs)
-	{
-	  if (!strcmp(lang, *all_langs))
-	    break;
-	  all_langs++;
-	}
-      if (! *all_langs)
-	{
-	  fprintf(stderr, "ERROR: Unable to find language \"%s\"!\n", lang);
-	  return (1);
-	}
-    }
-  set_language(lang);
-#endif
-
   if ((p = stp_get_printer_by_driver(hostname)) == NULL)
   {
     fprintf(stderr, "ERROR: Unable to find driver \"%s\"!\n", hostname);
@@ -359,10 +309,6 @@ list_ppds(const char *argv0)		/* I - Name of program */
   const char		*scheme;	/* URI scheme */
   int			i;		/* Looping var */
   const stp_printer_t	*printer;	/* Pointer to printer driver */
-#if defined(ENABLE_NLS) && defined(CUPS_TRANSLATED_PPDS)
-  char **langs = getlangs();
-  char **langptr;
-#endif
 
   if ((scheme = strrchr(argv0, '/')) != NULL)
     scheme ++;
@@ -376,55 +322,27 @@ list_ppds(const char *argv0)		/* I - Name of program */
 	  !strcmp(stp_printer_get_family(printer), "raw"))
         continue;
 
-      printf("\"%s://%s/expert/%s\" "
+      printf("\"%s://%s/expert\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
 	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
-             scheme, stp_printer_get_driver(printer), "C",
+             scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
 	     stp_printer_get_long_name(printer));
 
 #ifdef GENERATE_SIMPLIFIED_PPDS
-      printf("\"%s://%s/simple/%s\" "
+      printf("\"%s://%s/simple\" "
              "%s "
 	     "\"%s\" "
              "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
 	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
-             scheme, stp_printer_get_driver(printer), "C",
+             scheme, stp_printer_get_driver(printer),
 	     "en",
 	     stp_printer_get_manufacturer(printer),
 	     stp_printer_get_long_name(printer));
 #endif
-#if defined(ENABLE_NLS) && defined(CUPS_TRANSLATED_PPDS)
-      langptr = langs;
-      while (*langptr != 0 && strcmp(*langptr, "") != 0)
-	{
-	  printf("\"%s://%s/expert/%s\" "
-		 "%s "
-		 "\"%s\" "
-		 "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
-		 "\"\"\n",		/* No IEEE-1284 Device ID yet */
-		 scheme, stp_printer_get_driver(printer), *langptr,
-		 *langptr,
-		 stp_printer_get_manufacturer(printer),
-		 stp_printer_get_long_name(printer));
-
-#ifdef GENERATE_SIMPLIFIED_PPDS
-	  printf("\"%s://%s/simple/%s\" "
-		 "%s "
-		 "\"%s\" "
-		 "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
-		 "\"\"\n",		/* No IEEE-1284 Device ID yet */
-		 scheme, stp_printer_get_driver(printer), *langptr,
-		 *langptr,
-		 stp_printer_get_manufacturer(printer),
-		 stp_printer_get_long_name(printer));
-#endif
-	  langptr++;
-	}
-#endif
     }
 
   return (0);
@@ -460,7 +378,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
   for (;;)
   {
-    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:sa")) == -1)
+    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:saN")) == -1)
       break;
 
     switch (i)
@@ -482,12 +400,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
       verbose = 0;
       break;
     case 'c':
-#  ifdef ENABLE_NLS
-      baselocaledir = optarg;
-#  ifdef DEBUG
-      fprintf(stderr, "DEBUG: baselocaledir: %s\n", baselocaledir);
-#  endif
-#  endif
+      fputs("ERROR: -c option no longer supported!\n", stderr);
       break;
     case 'p':
       prefix = optarg;
@@ -513,9 +426,12 @@ main(int  argc,			    /* I - Number of command-line arguments */
     case 'a':
       which_ppds = 3;
       break;
+    case 'N':
+      localize_numbers = !localize_numbers;
+      break;
     case 'V':
       printf("cups-genppd version %s, "
-	     "Copyright 1993-2006 by Easy Software Products and Robert Krawitz.\n\n",
+	     "Copyright 1993-2008 by Michael R Sweet and Robert Krawitz.\n\n",
 	     VERSION);
       printf("Default CUPS PPD PostScript Level: %d\n", cups_ppd_ps_level);
       printf("Default PPD location (prefix):     %s\n", CUPS_MODELDIR);
@@ -527,20 +443,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	   "This program is distributed in the hope that it will be useful,\n"
 	   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 	   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-	   "GNU General Public License for more details.\n"
-	   "\n");
-      puts("You should have received a copy of the GNU General Public License\n"
-	   "along with this program; if not, please contact Easy Software\n"
-	   "Products at:\n"
-	   "\n"
-	   "    Attn: CUPS Licensing Information\n"
-	   "    Easy Software Products\n"
-	   "    44141 Airport View Drive, Suite 204\n"
-	   "    Hollywood, Maryland 20636-3111 USA\n"
-	   "\n"
-	   "    Voice: (301) 373-9603\n"
-	   "    EMail: cups-info@cups.org\n"
-	   "      WWW: http://www.cups.org\n");
+	   "GNU General Public License for more details.\n");
       exit(EXIT_SUCCESS);
       break;
     default:
@@ -568,17 +471,8 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
   stp_init();
 
- /*
-  * Set the language...
-  */
-
-#  ifdef ENABLE_NLS
   langs = getlangs();
 
-  if (language)
-    set_language(language);
-#  endif /* ENABLE_NLS */
-
  /*
   * Print lists
   */
@@ -752,7 +646,6 @@ help(void)
        "  -V            Show version information and defaults.\n"
        "  The default is to output PPDs.\n");
   puts("Options:\n"
-       "  -c localedir  Use localedir as the base directory for locale data.\n"
        "  -l locale     Output PPDs translated with messages for locale.\n"
        "  -p prefix     Output PPDs in directory prefix.\n"
        "  -d prefix     Embed directory prefix in PPD file.\n"
@@ -771,9 +664,9 @@ help(void)
 void
 usage(void)
 {
-  puts("Usage: cups-genppd [-c localedir] "
+  puts("Usage: cups-genppd "
         "[-l locale] [-p prefix] [-s | -a] [-q] [-v] models...\n"
-        "       cups-genppd -L [-c localedir]\n"
+        "       cups-genppd -L\n"
 	"       cups-genppd -M [-v]\n"
 	"       cups-genppd -h\n"
 	"       cups-genppd -V\n");
@@ -833,7 +726,6 @@ printmodels(int verbose)		/* I - Verbosity level */
  * 'getlangs()' - Get a list of available translations.
  */
 
-#ifdef ENABLE_NLS
 char **					/* O - Array of languages */
 getlangs(void)
 {
@@ -867,69 +759,6 @@ getlangs(void)
   return (langs);
 }
 
-/*
- * 'set_language()' - Set the current translation language.
- */
-
-static void
-set_language(const char *lang)		/* I - Locale name */
-{
-  char *l = setlocale(LC_ALL, lang ? lang : "");
-
-  /* Make sure the locale we tried to set was accepted! */
-  if (lang && !l)
-    {
-      int i;
-      for (i = 0; i < lang_map_count; i++)
-	{
-	  const locale_map *lm = &(lang_mappings[i]);
-	  if (!strcmp(lang, lm->lang))
-	    {
-	      l = setlocale(LC_ALL, lm->mapping);
-	      if (l)
-		break;
-	    }
-	}
-    }
-
-#  ifdef LC_CTYPE
-  setlocale(LC_CTYPE, l ? l : "");
-#  endif /* LC_CTYPE */
-#  ifdef LC_NUMERIC
-  setlocale(LC_NUMERIC, "C");
-#  endif /* LC_NUMERIC */
-
- /*
-  * Set up the catalog
-  */
-
-  if (baselocaledir)
-  {
-    if ((bindtextdomain(PACKAGE, baselocaledir)) == NULL)
-    {
-      fprintf(stderr, "cups-genppd: cannot load message catalog %s under %s: %s\n",
-	      PACKAGE, baselocaledir, strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-
-#  ifdef DEBUG
-    fprintf(stderr, "DEBUG: bound textdomain: %s under %s\n",
-	    PACKAGE, baselocaledir);
-#  endif /* DEBUG */
-
-    if ((textdomain(PACKAGE)) == NULL)
-    {
-      fprintf(stderr,
-              "cups-genppd: cannot select message catalog %s under %s: %s\n",
-              PACKAGE, baselocaledir, strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-#  ifdef DEBUG
-    fprintf(stderr, "DEBUG: textdomain set: %s\n", PACKAGE);
-#  endif /* DEBUG */
-  }
-}
-#endif /* ENABLE_NLS */
 
 /*
  * 'is_special_option()' - Determine if an option should be grouped.
@@ -948,6 +777,57 @@ is_special_option(const char *name)	/* I - Option name */
   return 0;
 }
 
+static size_t
+bytelen(const char *buffer)
+{
+  size_t answer = 0;
+  while (*buffer++ != '\0')
+    answer++;
+  return answer;
+}
+
+static void
+print_group(
+    gzFile                fp,		/* I - File to write to */
+    const char		  *what,
+    stp_parameter_class_t p_class,	/* I - Option class */
+    stp_parameter_level_t p_level,	/* I - Option level */
+    const char		  *language,	/* I - Language */
+    stp_string_list_t     *po)		/* I - Message catalog */
+{
+  char buf[64];
+  const char *class = stp_i18n_lookup(po, parameter_class_names[p_class]);
+  const char *level = stp_i18n_lookup(po, parameter_level_names[p_level]);
+  size_t bytes = bytelen(class) + bytelen(level);
+  snprintf(buf, 40, "%s%s%s", class, bytes < 39 ? " " : "", level);
+  gzprintf(fp, "*%sGroup: C%dL%d/%s\n", what, p_class, p_level, buf);
+  if (language && !strcmp(language, "C") && !strcmp(what, "Open"))
+    {
+      char		**all_langs = getlangs();/* All languages */
+      const char *lang;
+      int langnum;
+
+      for (langnum = 0; all_langs[langnum]; langnum ++)
+	{
+	  stp_string_list_t *altpo;
+
+	  lang = all_langs[langnum];
+
+	  if (!strcmp(lang, "C") || !strcmp(lang, "en"))
+	    continue;
+	  if ((altpo = stp_i18n_load(lang)) != NULL)
+	    {
+	      class = stp_i18n_lookup(altpo, parameter_class_names[p_class]);
+	      level = stp_i18n_lookup(altpo, parameter_level_names[p_level]);
+	      bytes = bytelen(class) + bytelen(level);
+	      snprintf(buf, 40, "%s%s%s", class, bytes < 39 ? " " : "", level);
+	      gzprintf(fp, "*%s.Translation C%dL%d/%s: \"\"\n",
+		       lang, p_class, p_level, buf);
+            }
+	}
+    }
+  gzputs(fp, "\n");
+}
 
 /*
  * 'print_group_close()' - Close a UI group.
@@ -957,11 +837,11 @@ static void
 print_group_close(
     gzFile                fp,		/* I - File to write to */
     stp_parameter_class_t p_class,	/* I - Option class */
-    stp_parameter_level_t p_level)	/* I - Option level */
+    stp_parameter_level_t p_level,	/* I - Option level */
+    const char		 *language,	/* I - language */
+    stp_string_list_t    *po)		/* I - Message catalog */
 {
-  gzprintf(fp, "*CloseGroup: %s %s\n\n",
-	   gettext(parameter_class_names[p_class]),
-	   gettext(parameter_level_names[p_level]));
+  print_group(fp, "Close", p_class, p_level, NULL, NULL);
 }
 
 
@@ -973,11 +853,11 @@ static void
 print_group_open(
     gzFile                fp,		/* I - File to write to */
     stp_parameter_class_t p_class,	/* I - Option class */
-    stp_parameter_level_t p_level)	/* I - Option level */
+    stp_parameter_level_t p_level,	/* I - Option level */
+    const char		 *language,	/* I - language */
+    stp_string_list_t    *po)		/* I - Message catalog */
 {
-  gzprintf(fp, "*OpenGroup: %s %s\n\n",
-	   gettext(parameter_class_names[p_class]),
-	   gettext(parameter_level_names[p_level]));
+  print_group(fp, "Open", p_class, p_level, language ? language : "C", po);
 }
 
 
@@ -1020,6 +900,11 @@ write_ppd(
   int printer_is_color = 0;
   int maximum_level = simplified ?
     STP_PARAMETER_LEVEL_BASIC : STP_PARAMETER_LEVEL_ADVANCED4;
+  char		*default_resolution = NULL;  /* Default resolution mapped name */
+  stp_string_list_t *resolutions = stp_string_list_create();
+  char		**all_langs = getlangs();/* All languages */
+  stp_string_list_t	*po = stp_i18n_load(language);
+					/* Message catalog */
 
 
  /*
@@ -1039,9 +924,12 @@ write_ppd(
   * Write a standard header...
   */
 
+#undef _
+#define _(x) stp_i18n_lookup(po, x)
+
   gzputs(fp, "*PPD-Adobe: \"4.3\"\n");
   gzputs(fp, "*% PPD file for CUPS/Gutenprint.\n");
-  gzputs(fp, "*% Copyright 1993-2006 by Easy Software Products and Robert Krawitz.\n");
+  gzputs(fp, "*% Copyright 1993-2008 by Mike Sweet and Robert Krawitz.\n");
   gzputs(fp, "*% This program is free software; you can redistribute it and/or\n");
   gzputs(fp, "*% modify it under the terms of the GNU General Public License,\n");
   gzputs(fp, "*% version 2, as published by the Free Software Foundation.\n");
@@ -1062,8 +950,10 @@ write_ppd(
    * Use the English name of your language here, e.g. "Swedish" instead of
    * "Svenska". */
   gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
-  /* TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 */
-  gzprintf(fp, "*LanguageEncoding: %s\n", _("ISOLatin1"));
+  if (language)
+    gzputs(fp, "*LanguageEncoding: UTF-8\n");
+  else
+    gzputs(fp, "*LanguageEncoding: ISOLatin1\n");
 
  /*
   * Strictly speaking, the PCFileName attribute should be a 12 character
@@ -1080,13 +970,13 @@ write_ppd(
  /*
   * The Product attribute specifies the string returned by the PostScript
   * interpreter.  The last one will appear in the CUPS "product" field,
-  * while all instances are available as attributes.
+  * while all instances are available as attributes.  Rather than listing
+  * the PostScript interpreters we might encounter, we instead just list
+  * a single product line with the "long name" to be compatible with other
+  * CUPS-based drivers. (This is a change from Gutenprint 5.0 and earlier)
   */
 
-  gzputs(fp, "*Product:	\"(AFPL Ghostscript)\"\n");
-  gzputs(fp, "*Product:	\"(GNU Ghostscript)\"\n");
-  gzputs(fp, "*Product:	\"(ESP Ghostscript)\"\n");
-  gzputs(fp, "*Product:	\"(GPL Ghostscript)\"\n");
+  gzprintf(fp, "*Product:	\"(%s)\"\n", long_name);
 
  /*
   * The ModelName attribute now provides the long name rather than the
@@ -1112,18 +1002,7 @@ write_ppd(
   if (cups_ppd_ps_level == 2)
     gzputs(fp, "*PSVersion:	\"(2017.000) 550\"\n");
   else
-    {
-      gzputs(fp, "*PSVersion:	\"(3010.000) 651\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 652\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 653\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 704\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 705\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 707\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 800\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 815\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 850\"\n");
-      gzputs(fp, "*PSVersion:	\"(3010.000) 81501\"\n");
-    }
+    gzputs(fp, "*PSVersion:	\"(3010.000) 0\"\n");
   gzprintf(fp, "*LanguageLevel:	\"%d\"\n", cups_ppd_ps_level);
 
   /* Set Job Mode to "Job" as this enables the Duplex option */
@@ -1154,12 +1033,39 @@ write_ppd(
   gzputs(fp, "*LandscapeOrientation: Plus90\n");
   gzputs(fp, "*TTRasterizer:	Type42\n");
 
-  gzputs(fp, "*cupsVersion:	1.1\n");
-  gzprintf(fp, "*cupsModelNumber: \"0\"\n");
+  gzputs(fp, "*cupsVersion:	1.2\n");
   gzputs(fp, "*cupsManualCopies: True\n");
   gzprintf(fp, "*cupsFilter:	\"application/vnd.cups-raster 100 rastertogutenprint.%s\"\n", GUTENPRINT_RELEASE_VERSION);
   if (strcasecmp(manufacturer, "EPSON") == 0)
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
+  if (!language)
+  {
+   /*
+    * Generate globalized PPDs when POSIX language is requested...
+    */
+
+    const char *prefix = "*cupsLanguages: \"";
+
+    for (i = 0; all_langs[i]; i ++)
+    {
+      if (!strcmp(all_langs[i], "C") || !strcmp(all_langs[i], "en"))
+        continue;
+
+      gzprintf(fp, "%s%s", prefix, all_langs[i]);
+      prefix = " ";
+    }
+
+    if (!strcmp(prefix, " "))
+      gzputs(fp, "\"\n");
+  }
+
+  /* Macintosh color management */
+  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, "*APCustomColorMatchingProfile: sRGB\n");
+
   gzputs(fp, "\n");
   gzprintf(fp, "*StpDriverName:	\"%s\"\n", driver);
   gzprintf(fp, "*StpDriverModelFamily:	\"%d_%s\"\n", model, family);
@@ -1223,7 +1129,7 @@ write_ppd(
       top = 0;
 
     the_papers[cur_opt].name   = opt->name;
-    the_papers[cur_opt].text   = opt->text;
+    the_papers[cur_opt].text   = stp_i18n_lookup(po, opt->text);
     the_papers[cur_opt].width  = width;
     the_papers[cur_opt].height = height;
     the_papers[cur_opt].left   = left;
@@ -1242,7 +1148,8 @@ write_ppd(
 
   gzprintf(fp, "*VariablePaperSize: %s\n\n", variable_sizes ? "true" : "false");
 
-  gzputs(fp, "*OpenUI *PageSize: PickOne\n");
+  gzprintf(fp, "*OpenUI *PageSize/%s: PickOne\n", _("Media Size"));
+  gzputs(fp, "*OPOptionHints PageSize: \"dropdown\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageSize\n");
   gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	   desc.name, desc.p_type, desc.is_mandatory,
@@ -1257,7 +1164,8 @@ write_ppd(
   }
   gzputs(fp, "*CloseUI: *PageSize\n\n");
 
-  gzputs(fp, "*OpenUI *PageRegion: PickOne\n");
+  gzprintf(fp, "*OpenUI *PageRegion/%s: PickOne\n", _("Media Size"));
+  gzputs(fp, "*OPOptionHints PageRegion: \"dropdown\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageRegion\n");
   gzprintf(fp, "*DefaultPageRegion: %s\n", desc.deflt.str);
   gzprintf(fp, "*StpDefaultPageRegion: %s\n", desc.deflt.str);
@@ -1293,8 +1201,7 @@ write_ppd(
 
   if (variable_sizes)
   {
-    stp_get_size_limit(v, &max_width, &max_height,
-			       &min_width, &min_height);
+    stp_get_size_limit(v, &max_width, &max_height, &min_width, &min_height);
     stp_set_string_parameter(v, "PageSize", "Custom");
     stp_get_media_size(v, &width, &height);
     stp_get_maximum_imageable_area(v, &left, &right, &bottom, &top);
@@ -1330,7 +1237,8 @@ write_ppd(
   * Do we support color?
   */
 
-  gzputs(fp, "*OpenUI *ColorModel/Color Model: PickOne\n");
+  gzprintf(fp, "*OpenUI *ColorModel/%s: PickOne\n", _("Color Model"));
+  gzputs(fp, "*OPOptionHints ColorModel: \"radiobuttons\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *ColorModel\n");
 
   if (printer_is_color)
@@ -1344,51 +1252,51 @@ write_ppd(
       gzputs(fp, "*StpDefaultColorModel: Gray\n");
     }
 
-  gzprintf(fp, "*ColorModel Gray/Grayscale:\t\"<<"
+  gzprintf(fp, "*ColorModel Gray/%s:\t\"<<"
                "/cupsColorSpace %d"
 	       "/cupsColorOrder %d"
 	       "%s"
 	       ">>setpagedevice\"\n",
-           CUPS_CSPACE_W, CUPS_ORDER_CHUNKED,
-	   simplified ? "/cupsBitsPerColor 8" : "");
-  gzprintf(fp, "*ColorModel Black/Inverted Grayscale:\t\"<<"
+           _("Grayscale"), CUPS_CSPACE_W, CUPS_ORDER_CHUNKED,
+	   simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+  gzprintf(fp, "*ColorModel Black/%s:\t\"<<"
                "/cupsColorSpace %d"
 	       "/cupsColorOrder %d"
 	       "%s"
 	       ">>setpagedevice\"\n",
-           CUPS_CSPACE_K, CUPS_ORDER_CHUNKED,
-	   simplified ? "/cupsBitsPerColor 8" : "");
+           _("Inverted Grayscale"), CUPS_CSPACE_K, CUPS_ORDER_CHUNKED,
+	   simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
 
   if (printer_is_color)
   {
-    gzprintf(fp, "*ColorModel RGB/RGB Color:\t\"<<"
+    gzprintf(fp, "*ColorModel RGB/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_RGB, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
-    gzprintf(fp, "*ColorModel CMY/CMY Color:\t\"<<"
+             _("RGB Color"), CUPS_CSPACE_RGB, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+    gzprintf(fp, "*ColorModel CMY/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_CMY, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
-    gzprintf(fp, "*ColorModel CMYK/CMYK:\t\"<<"
+             _("CMY Color"), CUPS_CSPACE_CMY, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+    gzprintf(fp, "*ColorModel CMYK/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_CMYK, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
-    gzprintf(fp, "*ColorModel KCMY/KCMY:\t\"<<"
+             _("CMYK"), CUPS_CSPACE_CMYK, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
+    gzprintf(fp, "*ColorModel KCMY/%s:\t\"<<"
                  "/cupsColorSpace %d"
 		 "/cupsColorOrder %d"
 	         "%s"
 		 ">>setpagedevice\"\n",
-             CUPS_CSPACE_KCMY, CUPS_ORDER_CHUNKED,
-	     simplified ? "/cupsBitsPerColor 8" : "");
+             _("KCMY"), CUPS_CSPACE_KCMY, CUPS_ORDER_CHUNKED,
+	     simplified ? "/cupsBitsPerColor 8/cupsPreferredBitsPerColor 16" : "");
   }
 
   gzputs(fp, "*CloseUI: *ColorModel\n\n");
@@ -1398,15 +1306,16 @@ write_ppd(
       /*
        * 8 or 16 bit color (16 bit is slower)
        */
-      gzputs(fp, "*OpenUI *StpColorPrecision/Color Precision: PickOne\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, "*DefaultStpColorPrecision: Normal\n");
       gzputs(fp, "*StpDefaultStpColorPrecision: Normal\n");
-      gzputs(fp, "*StpColorPrecision Normal/Normal:\t\"<<"
-	     "/cupsBitsPerColor 8>>setpagedevice\"\n");
-      gzputs(fp, "*StpColorPrecision Best/Best:\t\"<<"
-	     "/cupsBitsPerColor 8"
-	     "/cupsPreferredBitsPerColor 16>>setpagedevice\"\n");
+      gzprintf(fp, "*StpColorPrecision Normal/%s:\t\"<<"
+	           "/cupsBitsPerColor 8>>setpagedevice\"\n", _("Normal"));
+      gzprintf(fp, "*StpColorPrecision Best/%s:\t\"<<"
+		   "/cupsBitsPerColor 8"
+		   "/cupsPreferredBitsPerColor 16>>setpagedevice\"\n", _("Best"));
       gzputs(fp, "*CloseUI: *StpColorPrecision\n\n");
     }
 
@@ -1420,6 +1329,7 @@ write_ppd(
   if (num_opts > 0)
   {
     gzprintf(fp, "*OpenUI *MediaType/%s: PickOne\n", _("Media Type"));
+    gzputs(fp, "*OPOptionHints MediaType: \"dropdown\"\n");
     gzputs(fp, "*OrderDependency: 10 AnySetup *MediaType\n");
     gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	     desc.name, desc.p_type, desc.is_mandatory,
@@ -1431,7 +1341,7 @@ write_ppd(
     {
       opt = stp_string_list_param(desc.bounds.str, i);
       gzprintf(fp, "*MediaType %s/%s:\t\"<</MediaType(%s)>>setpagedevice\"\n",
-               opt->name, opt->text, opt->name);
+               opt->name, stp_i18n_lookup(po, opt->text), opt->name);
     }
 
     gzputs(fp, "*CloseUI: *MediaType\n\n");
@@ -1448,6 +1358,7 @@ write_ppd(
   if (num_opts > 0)
   {
     gzprintf(fp, "*OpenUI *InputSlot/%s: PickOne\n", _("Media Source"));
+    gzputs(fp, "*OPOptionHints InputSlot: \"dropdown\"\n");
     gzputs(fp, "*OrderDependency: 10 AnySetup *InputSlot\n");
     gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	     desc.name, desc.p_type, desc.is_mandatory,
@@ -1459,7 +1370,7 @@ write_ppd(
     {
       opt = stp_string_list_param(desc.bounds.str, i);
       gzprintf(fp, "*InputSlot %s/%s:\t\"<</MediaClass(%s)>>setpagedevice\"\n",
-               opt->name, opt->text, opt->name);
+               opt->name, stp_i18n_lookup(po, opt->text), opt->name);
     }
 
     gzputs(fp, "*CloseUI: *InputSlot\n\n");
@@ -1475,14 +1386,18 @@ write_ppd(
     {
       stp_clear_string_parameter(v, "Resolution");
       has_quality_parameter = 1;
-      gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", gettext(desc.text));
+      num_opts = stp_string_list_count(desc.bounds.str);
+      gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", stp_i18n_lookup(po, desc.text));
+      if (num_opts > 3)
+	gzputs(fp, "*OPOptionHints Quality: \"radiobuttons\"\n");
+      else
+	gzputs(fp, "*OPOptionHints Quality: \"dropdown\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *StpQuality\n");
       gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	       desc.name, desc.p_type, desc.is_mandatory,
 	       desc.p_type, desc.p_level, desc.channel, 0.0, 0.0, 0.0);
       gzprintf(fp, "*DefaultStpQuality: %s\n", desc.deflt.str);
       gzprintf(fp, "*StpDefaultStpQuality: %s\n", desc.deflt.str);
-      num_opts = stp_string_list_count(desc.bounds.str);
       for (i = 0; i < num_opts; i++)
 	{
 	  opt = stp_string_list_param(desc.bounds.str, i);
@@ -1499,7 +1414,7 @@ write_ppd(
 	      stp_parameter_description_destroy(&res_desc);
 	    }
 	  gzprintf(fp, "*StpQuality %s/%s:\t\"<</HWResolution[%d %d]/cupsRowFeed %d>>setpagedevice\"\n",
-		   opt->name, opt->text, xdpi, ydpi, i + 1);
+		   opt->name, stp_i18n_lookup(po, opt->text), xdpi, ydpi, i + 1);
 	}
       gzputs(fp, "*CloseUI: *StpQuality\n\n");
     }
@@ -1521,6 +1436,10 @@ write_ppd(
       int tmp_xdpi, tmp_ydpi;
 
       gzprintf(fp, "*OpenUI *Resolution/%s: PickOne\n", _("Resolution"));
+      if (num_opts > 3)
+	gzputs(fp, "*OPOptionHints Resolution: \"resolution radiobuttons\"\n");
+      else
+	gzputs(fp, "*OPOptionHints Resolution: \"resolution dropdown\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *Resolution\n");
       gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 	       desc.name, desc.p_type, desc.is_mandatory,
@@ -1535,10 +1454,12 @@ write_ppd(
 	  stp_describe_resolution(v, &xdpi, &ydpi);
 	  stp_clear_string_parameter(v, "Quality");
 	  tmp_xdpi = xdpi;
+	  while (tmp_xdpi > MAXIMUM_SAFE_PPD_X_RESOLUTION)
+	    tmp_xdpi /= 2;
 	  tmp_ydpi = ydpi;
-	  if (tmp_ydpi > tmp_xdpi)
-	    tmp_ydpi = tmp_xdpi;
-	  else
+	  while (tmp_ydpi > MAXIMUM_SAFE_PPD_Y_RESOLUTION)
+	    tmp_ydpi /= 2;
+	  if (tmp_ydpi < tmp_xdpi)
 	    tmp_xdpi = tmp_ydpi;
 	  /*
 	     Make the default resolution look like an almost square resolution
@@ -1546,12 +1467,13 @@ write_ppd(
 	     excess resolution.  However, make the hardware resolution
 	     match the printer default.
 	  */
-	  (void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi, tmp_xdpi + 1);
+	  (void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi + 1, tmp_xdpi);
+	  default_resolution = stp_strdup(res_name);
 	  stp_string_list_add_string(res_list, res_name, res_name);
 	  gzprintf(fp, "*DefaultResolution: %s\n", res_name);
 	  gzprintf(fp, "*StpDefaultResolution: %s\n", res_name);
-	  gzprintf(fp, "*Resolution %s/Automatic:\t\"<</HWResolution[%d %d]>>setpagedevice\"\n",
-		   res_name, xdpi, ydpi);
+	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]>>setpagedevice\"\n",
+		   res_name, _("Automatic"), xdpi, ydpi);
 	  gzprintf(fp, "*StpResolutionMap: %s %s\n", res_name, "None");
 	}
       else
@@ -1583,32 +1505,44 @@ write_ppd(
 	  stp_set_string_parameter(v, "Resolution", opt->name);
 	  stp_describe_resolution(v, &xdpi, &ydpi);
 
-	  /* This should not happen! */
+	  /* This should only happen with a "None" resolution */
 	  if (xdpi == -1 || ydpi == -1)
 	    continue;
 
 	  resolution_ok = 0;
 	  tmp_xdpi = xdpi;
+	  while (tmp_xdpi > MAXIMUM_SAFE_PPD_X_RESOLUTION)
+	    tmp_xdpi /= 2;
 	  tmp_ydpi = ydpi;
+	  while (tmp_ydpi > MAXIMUM_SAFE_PPD_Y_RESOLUTION)
+	    tmp_ydpi /= 2;
 	  do
 	    {
 	      if (tmp_xdpi == tmp_ydpi)
 		(void) snprintf(res_name, 63, "%ddpi", tmp_xdpi);
 	      else
 		(void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi, tmp_ydpi);
-	      if (strcmp(opt->name, desc.deflt.str) == 0 ||
+	      if ((!has_quality_parameter &&
+		   strcmp(opt->name, desc.deflt.str) == 0) ||
 		  !stp_string_list_is_present(res_list, res_name))
 		{
 		  resolution_ok = 1;
 		  stp_string_list_add_string(res_list, res_name, res_name);
 		}
-	      else if (tmp_ydpi > tmp_xdpi)
+	      else if (tmp_ydpi > tmp_xdpi &&
+		       tmp_ydpi < MAXIMUM_SAFE_PPD_Y_RESOLUTION)
+		/* Note that we're incrementing the *higher* resolution.
+		   This will generate less aliasing, and apps that convert
+		   down to a square resolution will do the right thing. */
 		tmp_ydpi++;
-	      else
+	      else if (tmp_xdpi < MAXIMUM_SAFE_PPD_X_RESOLUTION)
 		tmp_xdpi++;
+	      else
+		tmp_xdpi /= 2;
 	    } while (!resolution_ok);
+	  stp_string_list_add_string(resolutions, res_name, res_name);
 	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
-		   res_name, opt->text, xdpi, ydpi, i + 1);
+		   res_name, stp_i18n_lookup(po, opt->text), xdpi, ydpi, i + 1);
 	  if (strcmp(res_name, opt->name) != 0)
 	    gzprintf(fp, "*StpResolutionMap: %s %s\n", res_name, opt->name);
 	}
@@ -1622,12 +1556,13 @@ write_ppd(
   stp_describe_parameter(v, "OutputOrder", &desc);
   if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
-      gzputs(fp, "*OpenUI *OutputOrder: PickOne\n");
+      gzprintf(fp, "*OpenUI *OutputOrder/%s: PickOne\n", _("Output Order"));
+      gzputs(fp, "*OPOptionHints OutputOrder: \"radiobuttons\"\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *OutputOrder\n");
       gzprintf(fp, "*DefaultOutputOrder: %s\n", desc.deflt.str);
       gzprintf(fp, "*StpDefaultOutputOrder: %s\n", desc.deflt.str);
-      gzputs(fp, "*OutputOrder Normal/Normal: \"\"\n");
-      gzputs(fp, "*OutputOrder Reverse/Reverse: \"\"\n");
+      gzprintf(fp, "*OutputOrder Normal/%s: \"\"\n", _("Normal"));
+      gzprintf(fp, "*OutputOrder Reverse/%s: \"\"\n", _("Reverse"));
       gzputs(fp, "*CloseUI: *OutputOrder\n\n");
     }
   stp_parameter_description_destroy(&desc);
@@ -1639,12 +1574,13 @@ write_ppd(
   */
 
   stp_describe_parameter(v, "Duplex", &desc);
-  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+  if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
       num_opts = stp_string_list_count(desc.bounds.str);
       if (num_opts > 0)
       {
         gzprintf(fp, "*OpenUI *Duplex/%s: PickOne\n", _("2-Sided Printing"));
+	gzputs(fp, "*OPOptionHints Duplex: \"radiobuttons\"\n");
         gzputs(fp, "*OrderDependency: 10 AnySetup *Duplex\n");
 	gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 		 desc.name, desc.p_type, desc.is_mandatory,
@@ -1656,11 +1592,11 @@ write_ppd(
           {
             opt = stp_string_list_param(desc.bounds.str, i);
             if (strcmp(opt->name, "None") == 0)
-              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex false>>setpagedevice\"\n", opt->name, opt->text);
+              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex false>>setpagedevice\"\n", opt->name, stp_i18n_lookup(po, opt->text));
             else if (strcmp(opt->name, "DuplexNoTumble") == 0)
-              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble false>>setpagedevice\"\n", opt->name, opt->text);
+              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble false>>setpagedevice\"\n", opt->name, stp_i18n_lookup(po, opt->text));
             else if (strcmp(opt->name, "DuplexTumble") == 0)
-              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble true>>setpagedevice\"\n", opt->name, opt->text);
+              gzprintf(fp, "*Duplex %s/%s: \"<</Duplex true/Tumble true>>setpagedevice\"\n", opt->name, stp_i18n_lookup(po, opt->text));
            }
         gzputs(fp, "*CloseUI: *Duplex\n\n");
       }
@@ -1669,6 +1605,7 @@ write_ppd(
 
   gzprintf(fp, "*OpenUI *StpiShrinkOutput/%s: PickOne\n",
 	   _("Shrink Page If Necessary to Fit Borders"));
+  gzputs(fp, "*OPOptionHints StpiShrinkOutput: \"radiobuttons\"\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *StpiShrinkOutput\n");
   gzputs(fp, "*DefaultStpiShrinkOutput: Shrink\n");
   gzputs(fp, "*StpDefaultStpiShrinkOutput: Shrink\n");
@@ -1695,6 +1632,7 @@ write_ppd(
 		  (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
 		   lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
 		   lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
+		   lparam->p_type != STP_PARAMETER_TYPE_INT &&
 		   lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
 		  continue;
 	      stp_describe_parameter(v, lparam->name, &desc);
@@ -1703,16 +1641,23 @@ write_ppd(
 		  int printed_default_value = 0;
 		  if (!printed_open_group)
 		    {
-		      print_group_open(fp, j, k);
+		      print_group_open(fp, j, k, language, po);
 		      printed_open_group = 1;
 		    }
 		  gzprintf(fp, "*OpenUI *Stp%s/%s: PickOne\n",
-			   desc.name, gettext(desc.text));
+			   desc.name, stp_i18n_lookup(po, desc.text));
 		  gzprintf(fp, "*OrderDependency: 10 AnySetup *Stp%s\n",
 			   desc.name);
 		  switch (desc.p_type)
 		    {
 		    case STP_PARAMETER_TYPE_STRING_LIST:
+		      num_opts = stp_string_list_count(desc.bounds.str);
+		      if (num_opts > 3)
+			gzprintf(fp, "*OPOptionHints Stp%s: \"dropdown\"\n",
+				 lparam->name);
+		      else
+			gzprintf(fp, "*OPOptionHints Stp%s: \"radiobuttons\"\n",
+				 lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1731,15 +1676,16 @@ write_ppd(
 			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
 				   "None", _("None"));
 			}
-		      num_opts = stp_string_list_count(desc.bounds.str);
 		      for (i = 0; i < num_opts; i++)
 			{
 			  opt = stp_string_list_param(desc.bounds.str, i);
 			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n",
-				   desc.name, opt->name, opt->text);
+				   desc.name, opt->name, stp_i18n_lookup(po, opt->text));
 			}
 		      break;
 		    case STP_PARAMETER_TYPE_BOOLEAN:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"checkbox\"\n",
+			       lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1764,6 +1710,8 @@ write_ppd(
 			       desc.name, "True", _("Yes"));
 		      break;
 		    case STP_PARAMETER_TYPE_DOUBLE:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"slider input spinbox\"\n",
+			       lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1785,8 +1733,8 @@ write_ppd(
 				     desc.name, i, ((double) i) * .001);
 			}
 		      if (!desc.is_mandatory)
-			gzprintf(fp, "*Stp%s None/None: \"\"\n",
-				 desc.name);
+			gzprintf(fp, "*Stp%s None/%s: \"\"\n",
+				 desc.name, _("None"));
 		      else if (! printed_default_value)
 			gzprintf(fp, "*Stp%s None/%.3f: \"\"\n",
 				 desc.name, desc.deflt.dbl);
@@ -1803,7 +1751,9 @@ write_ppd(
 		      if (!simplified)
 			{
 			  gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
-				   desc.name, gettext(desc.text), _("Fine Adjustment"));
+				   desc.name, stp_i18n_lookup(po, desc.text), _("Fine Adjustment"));
+			  gzprintf(fp, "*OPOptionHints Stp%s: \"hide\"\n",
+				   lparam->name);
 			  gzprintf(fp, "*StpStpFine%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 				   desc.name, STP_PARAMETER_TYPE_INVALID, 0,
 				   0, 0, -1, 0.0, 0.0, 0.0);
@@ -1819,6 +1769,8 @@ write_ppd(
 
 		      break;
 		    case STP_PARAMETER_TYPE_DIMENSION:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"length slider input spinbox\"\n",
+			       lparam->name);
 		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 			       desc.name, desc.p_type, desc.is_mandatory,
 			       desc.p_class, desc.p_level, desc.channel,
@@ -1865,6 +1817,50 @@ write_ppd(
 			       desc.bounds.dimension.upper);
 
 		      break;
+		    case STP_PARAMETER_TYPE_INT:
+		      gzprintf(fp, "*OPOptionHints Stp%s: \"input spinbox\"\n",
+			       lparam->name);
+		      gzprintf(fp, "*StpStp%s: %d %d %d %d %d %.3f %.3f %.3f\n",
+			       desc.name, desc.p_type, desc.is_mandatory,
+			       desc.p_class, desc.p_level, desc.channel,
+			       (double) desc.bounds.integer.lower,
+			       (double) desc.bounds.integer.upper,
+			       (double) desc.deflt.integer);
+		      if (desc.is_mandatory)
+			{
+			  gzprintf(fp, "*DefaultStp%s: %d\n",
+				   desc.name, desc.deflt.integer);
+			  gzprintf(fp, "*StpDefaultStp%s: %d\n",
+				   desc.name, desc.deflt.integer);
+			}
+		      else
+			{
+			  gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
+				   "None", _("None"));
+			}
+		      for (i = desc.bounds.integer.lower;
+			   i <= desc.bounds.integer.upper; i++)
+			{
+			  gzprintf(fp, "*Stp%s %d/%d: \"\"\n",
+				   desc.name, i, i);
+			}
+
+		      print_close_ui = 0;
+		      gzprintf(fp, "*CloseUI: *Stp%s\n\n", desc.name);
+
+                     /*
+		      * Add custom option code and value parameter...
+		      */
+
+		      gzprintf(fp, "*CustomStp%s True: \"pop\"\n", desc.name);
+		      gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n",
+		               desc.name, _("Value"),
+			       desc.bounds.dimension.lower,
+			       desc.bounds.dimension.upper);
+
+		      break;
 		    default:
 		      break;
 		    }
@@ -1874,16 +1870,409 @@ write_ppd(
 	      stp_parameter_description_destroy(&desc);
 	    }
 	  if (printed_open_group)
-	    print_group_close(fp, j, k);
+	    print_group_close(fp, j, k, language, po);
+	}
+    }
+  stp_describe_parameter(v, "ImageType", &desc);
+  if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+    {
+      num_opts = stp_string_list_count(desc.bounds.str);
+      if (num_opts > 0)
+	{
+	  for (i = 0; i < num_opts; i++)
+	    {
+	      opt = stp_string_list_param(desc.bounds.str, i);
+	      if (strcmp(opt->name, "None") != 0)
+		gzprintf(fp, "*APPrinterPreset %s/%s: \"*StpImageType %s\"\n",
+			 opt->name, stp_i18n_lookup(po, opt->text), opt->name);
+	    }
+	  gzputs(fp, "\n");
+	}
+    }
+  stp_parameter_description_destroy(&desc);
+
+#undef _
+#define _(x) stp_i18n_lookup(altpo, x)
+
+  if (!language)
+  {
+   /*
+    * Generate globalized PPDs when POSIX language is requested...
+    */
+
+    const char *lang;
+    stp_string_list_t *altpo;
+    int langnum;
+
+    for (langnum = 0; all_langs[langnum]; langnum ++)
+    {
+      lang = all_langs[langnum];
+
+      if (!strcmp(lang, "C") || !strcmp(lang, "en"))
+        continue;
+
+      if ((altpo = stp_i18n_load(lang)) == NULL)
+        continue;
+
+     /*
+      * Get the page sizes from the driver...
+      */
+
+      if (printer_is_color)
+	stp_set_string_parameter(v, "PrintingMode", "Color");
+      else
+	stp_set_string_parameter(v, "PrintingMode", "BW");
+      stp_set_string_parameter(v, "ChannelBitDepth", "8");
+      stp_describe_parameter(v, "PageSize", &desc);
+      num_opts = stp_string_list_count(desc.bounds.str);
+
+      gzprintf(fp, "*%s.Translation PageSize/%s: \"\"\n", lang, _("Media Size"));
+      gzprintf(fp, "*%s.Translation PageRegion/%s: \"\"\n", lang, _("Media Size"));
+
+      for (i = 0; i < num_opts; i++)
+      {
+	const stp_papersize_t *papersize;
+	opt = stp_string_list_param(desc.bounds.str, i);
+	papersize = stp_get_papersize_by_name(opt->name);
+
+	if (!papersize)
+	  continue;
+
+/*
+	if (strcmp(opt->name, "Custom") == 0)
+	  continue;
+*/
+
+	if (simplified && num_opts >= 10 &&
+	    (papersize->paper_unit == PAPERSIZE_ENGLISH_EXTENDED ||
+	     papersize->paper_unit == PAPERSIZE_METRIC_EXTENDED))
+	  continue;
+
+	if ((papersize->width <= 0 || papersize->height <= 0) &&
+	    strcmp(opt->name, "Custom") != 0)
+	  continue;
+
+        gzprintf(fp, "*%s.PageSize %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+        gzprintf(fp, "*%s.PageRegion %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+      }
+
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Do we support color?
+      */
+
+      gzprintf(fp, "*%s.Translation ColorModel/%s: \"\"\n", lang, _("Color Model"));
+      gzprintf(fp, "*%s.ColorModel Gray/%s: \"\"\n", lang, _("Grayscale"));
+      gzprintf(fp, "*%s.ColorModel Black/%s: \"\"\n", lang, _("Inverted Grayscale"));
+
+      if (printer_is_color)
+      {
+	gzprintf(fp, "*%s.ColorModel RGB/%s: \"\"\n", lang, _("RGB Color"));
+	gzprintf(fp, "*%s.ColorModel CMY/%s: \"\"\n", lang, _("CMY Color"));
+	gzprintf(fp, "*%s.ColorModel CMYK/%s: \"\"\n", lang, _("CMYK"));
+	gzprintf(fp, "*%s.ColorModel KCMY/%s: \"\"\n", lang, _("KCMY"));
+      }
+
+      if (!simplified)
+	{
+	  /*
+	   * 8 or 16 bit color (16 bit is slower)
+	   */
+	  gzprintf(fp, "*%s.Translation StpColorPrecision/%s: \"\"\n", lang, _("Color Precision"));
+	  gzprintf(fp, "*%s.StpColorPrecision Normal/%s: \"\"\n", lang, _("Normal"));
+	  gzprintf(fp, "*%s.StpColorPrecision Best/%s: \"\"\n", lang, _("Best"));
+	}
+
+     /*
+      * Media types...
+      */
+
+      stp_describe_parameter(v, "MediaType", &desc);
+      num_opts = stp_string_list_count(desc.bounds.str);
+
+      if (num_opts > 0)
+      {
+	gzprintf(fp, "*%s.Translation MediaType/%s: \"\"\n", lang, _("Media Type"));
+
+	for (i = 0; i < num_opts; i ++)
+	{
+	  opt = stp_string_list_param(desc.bounds.str, i);
+	  gzprintf(fp, "*%s.MediaType %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+	}
+      }
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Input slots...
+      */
+
+      stp_describe_parameter(v, "InputSlot", &desc);
+      num_opts = stp_string_list_count(desc.bounds.str);
+
+      if (num_opts > 0)
+      {
+	gzprintf(fp, "*%s.Translation InputSlot/%s: \"\"\n", lang, _("Media Source"));
+
+	for (i = 0; i < num_opts; i ++)
+	{
+	  opt = stp_string_list_param(desc.bounds.str, i);
+	  gzprintf(fp, "*%s.InputSlot %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
 	}
+      }
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Quality settings
+      */
+
+      stp_describe_parameter(v, "Quality", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active)
+	{
+	  gzprintf(fp, "*%s.Translation StpQuality/%s: \"\"\n", lang, stp_i18n_lookup(altpo, desc.text));
+	  num_opts = stp_string_list_count(desc.bounds.str);
+	  for (i = 0; i < num_opts; i++)
+	    {
+	      opt = stp_string_list_param(desc.bounds.str, i);
+	      gzprintf(fp, "*%s.StpQuality %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+	    }
+	}
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Resolution
+      */
+
+      stp_describe_parameter(v, "Resolution", &desc);
+      num_opts = stp_string_list_count(resolutions);
+
+      if (!simplified || desc.p_level == STP_PARAMETER_LEVEL_BASIC)
+	{
+	  gzprintf(fp, "*%s.Translation Resolution/%s: \"\"\n", lang, _("Resolution"));
+	  if (has_quality_parameter)
+	    gzprintf(fp, "*%s.Resolution %s/%s: \"\"\n", lang,
+		     default_resolution, _("Automatic"));
+
+	  for (i = 0; i < num_opts; i ++)
+	    {
+	      opt = stp_string_list_param(resolutions, i);
+	      gzprintf(fp, "*%s.Resolution %s/%s: \"\"\n", lang,
+		       opt->name, stp_i18n_lookup(altpo, opt->text));
+	    }
+	}
+
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * OutputOrder
+      */
+
+      stp_describe_parameter(v, "OutputOrder", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  gzprintf(fp, "*%s.Translation OutputOrder/%s: \"\"\n", lang, _("Output Order"));
+	  gzprintf(fp, "*%s.OutputOrder Normal/%s: \"\"\n", lang, _("Normal"));
+	  gzprintf(fp, "*%s.OutputOrder Reverse/%s: \"\"\n", lang, _("Reverse"));
+	}
+      stp_parameter_description_destroy(&desc);
+
+     /*
+      * Duplex
+      * Note that the opt->name strings MUST match those in the printer driver(s)
+      * else the PPD files will not be generated correctly
+      */
+
+      stp_describe_parameter(v, "Duplex", &desc);
+      if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  num_opts = stp_string_list_count(desc.bounds.str);
+	  if (num_opts > 0)
+	  {
+	    gzprintf(fp, "*%s.Translation Duplex/%s: \"\"\n", lang, _("2-Sided Printing"));
+
+	    for (i = 0; i < num_opts; i++)
+	      {
+		opt = stp_string_list_param(desc.bounds.str, i);
+		if (strcmp(opt->name, "None") == 0)
+		  gzprintf(fp, "*%s.Duplex %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+		else if (strcmp(opt->name, "DuplexNoTumble") == 0)
+		  gzprintf(fp, "*%s.Duplex %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+		else if (strcmp(opt->name, "DuplexTumble") == 0)
+		  gzprintf(fp, "*%s.Duplex %s/%s: \"\"\n", lang, opt->name, stp_i18n_lookup(altpo, opt->text));
+	       }
+	  }
+	}
+      stp_parameter_description_destroy(&desc);
+
+      gzprintf(fp, "*%s.Translation StpiShrinkOutput/%s: \"\"\n", lang,
+	       _("Shrink Page If Necessary to Fit Borders"));
+      gzprintf(fp, "*%s.StpiShrinkOutput %s/%s: \"\"\n", lang, "Shrink", _("Shrink (print the whole page)"));
+      gzprintf(fp, "*%s.StpiShrinkOutput %s/%s: \"\"\n", lang, "Crop", _("Crop (preserve dimensions)"));
+      gzprintf(fp, "*%s.StpiShrinkOutput %s/%s: \"\"\n", lang, "Expand", _("Expand (use maximum page area)"));
+
+      param_list = stp_get_parameter_list(v);
+
+      for (j = 0; j <= STP_PARAMETER_CLASS_OUTPUT; j++)
+	{
+	  for (k = 0; k <= maximum_level; k++)
+	    {
+	      size_t param_count = stp_parameter_list_count(param_list);
+	      for (l = 0; l < param_count; l++)
+		{
+		  const stp_parameter_t *lparam =
+		    stp_parameter_list_param(param_list, l);
+		  if (lparam->p_class != j || lparam->p_level != k ||
+		      is_special_option(lparam->name) || lparam->read_only ||
+		      (lparam->p_type != STP_PARAMETER_TYPE_STRING_LIST &&
+		       lparam->p_type != STP_PARAMETER_TYPE_BOOLEAN &&
+		       lparam->p_type != STP_PARAMETER_TYPE_DIMENSION &&
+		       lparam->p_type != STP_PARAMETER_TYPE_INT &&
+		       lparam->p_type != STP_PARAMETER_TYPE_DOUBLE))
+		      continue;
+		  stp_describe_parameter(v, lparam->name, &desc);
+		  if (desc.is_active)
+		    {
+		      gzprintf(fp, "*%s.Translation Stp%s/%s: \"\"\n", lang,
+			       desc.name, stp_i18n_lookup(altpo, desc.text));
+		      switch (desc.p_type)
+			{
+			case STP_PARAMETER_TYPE_STRING_LIST:
+			  if (!desc.is_mandatory)
+			      gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				       "None", _("None"));
+			  num_opts = stp_string_list_count(desc.bounds.str);
+			  for (i = 0; i < num_opts; i++)
+			    {
+			      opt = stp_string_list_param(desc.bounds.str, i);
+			      gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang,
+				       desc.name, opt->name, stp_i18n_lookup(altpo, opt->text));
+			    }
+			  break;
+
+			case STP_PARAMETER_TYPE_BOOLEAN:
+			  if (!desc.is_mandatory)
+			      gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				       "None", _("None"));
+			  gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang,
+				   desc.name, "False", _("No"));
+			  gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang,
+				   desc.name, "True", _("Yes"));
+			  break;
+
+			case STP_PARAMETER_TYPE_DOUBLE:
+			  if (localize_numbers)
+			    {
+			      for (i = desc.bounds.dbl.lower * 1000;
+				   i <= desc.bounds.dbl.upper * 1000 ; i += 100)
+				{
+				  if (desc.deflt.dbl * 1000 == i && desc.is_mandatory)
+				    gzprintf(fp, "*%s.Stp%s None/%.3f: \"\"\n", lang,
+					     desc.name, ((double) i) * .001);
+				  else
+				    gzprintf(fp, "*%s.Stp%s %d/%.3f: \"\"\n", lang,
+					     desc.name, i, ((double) i) * .001);
+				}
+			    }
+			  if (!desc.is_mandatory)
+			    gzprintf(fp, "*%s.Stp%s None/%s: \"\"\n", lang,
+				     desc.name, _("None"));
+			  gzprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
+				   desc.name, _("Value"));
+			  if (!simplified)
+			    {
+			      gzprintf(fp, "*%s.Translation StpFine%s/%s %s: \"\"\n", lang,
+				       desc.name, stp_i18n_lookup(altpo, desc.text), _("Fine Adjustment"));
+			      gzprintf(fp, "*%s.StpFine%s None/%.3f: \"\"\n", lang,
+			               desc.name, 0.0);
+			      if (localize_numbers)
+				{
+				  for (i = 0; i < 100; i += 5)
+				    gzprintf(fp, "*%s.StpFine%s %d/%.3f: \"\"\n", lang,
+					     desc.name, i, ((double) i) * .001);
+				}
+			    }
+			  break;
+
+			case STP_PARAMETER_TYPE_DIMENSION:
+			  if (!desc.is_mandatory)
+			    gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				     "None", _("None"));
+			  if (localize_numbers)
+			    {
+			      for (i = desc.bounds.dimension.lower;
+				   i <= desc.bounds.dimension.upper; i++)
+				{
+				  /* FIXME
+				   * For now, just use mm; we'll fix it later
+				   * for the locale-appropriate setting.
+				   * --rlk 20040818
+				   */
+				  gzprintf(fp, "*%s.Stp%s %d/%.1f mm: \"\"\n", lang,
+					   desc.name, i, ((double) i) * 25.4 / 72);
+				}
+			    }
+			  gzprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
+				   desc.name, _("Value"));
+			  break;
+
+			case STP_PARAMETER_TYPE_INT:
+			  if (!desc.is_mandatory)
+			    gzprintf(fp, "*%s.Stp%s %s/%s: \"\"\n", lang, desc.name,
+				     "None", _("None"));
+			  if (localize_numbers)
+			    {
+			      for (i = desc.bounds.integer.lower;
+				   i <= desc.bounds.integer.upper; i++)
+				{
+				  gzprintf(fp, "*%s.Stp%s %d/%d: \"\"\n", lang,
+					   desc.name, i, i);
+				}
+			    }
+			  gzprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
+				   desc.name, _("Value"));
+			  break;
+
+			default:
+			  break;
+			}
+		    }
+		  stp_parameter_description_destroy(&desc);
+		}
+	    }
+	}
+      stp_describe_parameter(v, "ImageType", &desc);
+      if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	{
+	  num_opts = stp_string_list_count(desc.bounds.str);
+	  if (num_opts > 0)
+	    {
+	      for (i = 0; i < num_opts; i++)
+		{
+		  opt = stp_string_list_param(desc.bounds.str, i);
+		  if (strcmp(opt->name, "None") != 0)
+		    gzprintf(fp, "*%s.APPrinterPreset %s/%s: \"*StpImageType %s\"\n",
+			     lang, opt->name, opt->text, opt->name);
+		}
+	    }
+	}
+      stp_parameter_description_destroy(&desc);
     }
+  }
+  if (has_quality_parameter)
+    stp_free(default_resolution);
+  stp_string_list_destroy(resolutions);
+
   stp_parameter_list_destroy(param_list);
 
+#undef _
+#define _(x) x
+
+
  /*
   * Fonts...
   */
 
-  gzputs(fp, "*DefaultFont: Courier\n");
+  gzputs(fp, "\n*DefaultFont: Courier\n");
   gzputs(fp, "*Font AvantGarde-Book: Standard \"(001.006S)\" Standard ROM\n");
   gzputs(fp, "*Font AvantGarde-BookOblique: Standard \"(001.006S)\" Standard ROM\n");
   gzputs(fp, "*Font AvantGarde-Demi: Standard \"(001.007S)\" Standard ROM\n");
@@ -1925,10 +2314,11 @@ write_ppd(
 	   ppdext);
 
   stp_vars_destroy(v);
+
   return (0);
 }
 
 
 /*
- * End of "$Id: genppd.c,v 1.142 2008/04/06 21:16:08 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.170 2008/09/25 23:41:00 rlk Exp $".
  */
diff --git a/src/cups/i18n.c b/src/cups/i18n.c
new file mode 100644
index 0000000..59406ec
--- /dev/null
+++ b/src/cups/i18n.c
@@ -0,0 +1,481 @@
+/*
+ * "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $"
+ *
+ *   Internationalization functions for CUPS drivers.
+ *
+ *   Copyright 2008 Michael Sweet (mike@easysw.com)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 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.
+ *
+ * Contents:
+ *
+ *   stp_i18n_load()   - Load a message catalog for a locale.
+ *   stp_i18n_lookup() - Lookup a string in the message catalog...
+ *   stp_i18n_printf() - Send a formatted string to stderr.
+ *   stpi_unquote()    - Unquote characters in strings.
+ */
+
+/*
+ * Include necessary files...
+ */
+
+#include "i18n.h"
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <errno.h>
+#include <iconv.h>
+
+
+/*
+ * GNU gettext uses a simple .po file format:
+ *
+ *   # comment
+ *   msgid "id"
+ *   "optional continuation"
+ *   msgstr "str"
+ *   "optional continuation"
+ *
+ * Both the id and str strings use standard C quoting for special characters
+ * like newline and the double quote character.
+ */
+
+
+/*
+ * Cache structure...
+ */
+
+typedef struct stpi_i18n_s
+{
+  struct stpi_i18n_s	*next;		/* Next catalog */
+  char			locale[6];	/* Locale */
+  stp_string_list_t	*po;		/* Message catalog */
+} stpi_i18n_t;
+
+
+/*
+ * Local functions...
+ */
+
+static void	stpi_unquote(char *s);
+
+
+/*
+ * Local globals...
+ */
+
+static stpi_i18n_t	*stpi_pocache = NULL;
+
+
+/*
+ * 'stp_i18n_load()' - Load a message catalog for a locale.
+ */
+
+stp_string_list_t *			/* O - Message catalog */
+stp_i18n_load(const char *locale)	/* I - Locale name */
+{
+  stp_string_list_t	*po;		/* Message catalog */
+  char			ll_CC[6],	/* Locale ID */
+			poname[1024];	/* .po filename */
+  stpi_i18n_t		*pocache;	/* Current cache entry */
+  FILE			*pofile;	/* .po file */
+  const char		*stp_localedir;	/* STP_LOCALEDIR environment variable */
+  char			line[4096],	/* Line buffer */
+			*ptr,		/* Pointer into buffer */
+			id[4096],	/* Translation ID */
+			str[4096],	/* Translation string */
+			utf8str[4096];	/* UTF-8 translation string */
+  int			in_id,		/* Processing "id" string? */
+			in_str,		/* Processing "str" string? */
+			linenum;	/* Line number in .po file */
+  iconv_t		ic;		/* Transcoder to UTF-8 */
+  size_t		inbytes,	/* Number of input buffer bytes */
+			outbytes;	/* Number of output buffer bytes */
+  char			*inptr,		/* Pointer into input buffer */
+			*outptr;	/* Pointer into output buffer */
+  int			fuzzy = 0;	/* Fuzzy translation? */
+
+
+  if (!locale)
+    return (NULL);
+
+ /*
+  * See if the locale is already loaded...
+  */
+
+  for (pocache = stpi_pocache; pocache; pocache = pocache->next)
+    if (!strcmp(locale, pocache->locale))
+      return (pocache->po);
+
+ /*
+  * Find the message catalog for the given locale...
+  */
+
+  if ((stp_localedir = getenv("STP_LOCALEDIR")) == NULL)
+    stp_localedir = PACKAGE_LOCALE_DIR;
+
+  strncpy(ll_CC, locale, sizeof(ll_CC) - 1);
+  ll_CC[sizeof(ll_CC) - 1] = '\0';
+
+  if ((ptr = strchr(ll_CC, '.')) != NULL)
+    *ptr = '\0';
+
+  snprintf(poname, sizeof(poname), "%s/%s/gutenprint_%s.po", stp_localedir,
+	   ll_CC, ll_CC);
+  if (access(poname, 0) && strlen(ll_CC) > 2)
+  {
+    ll_CC[2] = '\0';
+
+    snprintf(poname, sizeof(poname), "%s/%s/gutenprint_%s.po", stp_localedir,
+             ll_CC, ll_CC);
+  }
+
+  if ((pofile = fopen(poname, "rb")) == NULL)
+    return (NULL);
+
+ /*
+  * Read the messages and add them to a string list...
+  */
+
+  if ((po = stp_string_list_create()) == NULL)
+  {
+    fclose(pofile);
+    return (NULL);
+  }
+
+  linenum = 0;
+  id[0]   = '\0';
+  str[0]  = '\0';
+  in_id   = 0;
+  in_str  = 0;
+  ic      = 0;
+
+  while (fgets(line, sizeof(line), pofile))
+  {
+    linenum ++;
+
+   /*
+    * Skip blank and comment lines...
+    */
+
+    if (line[0] == '#')
+    {
+      if (line[1] == ':')
+        fuzzy = 0;
+
+      if (strstr(line, "fuzzy"))
+        fuzzy = 1;
+    }
+
+    if (fuzzy || line[0] == '#' || line[0] == '\n')
+      continue;
+
+   /*
+    * Strip the trailing quote...
+    */
+
+    if ((ptr = (char *)strrchr(line, '\"')) == NULL)
+    {
+      fprintf(stderr, "DEBUG: Expected quoted string on line %d of %s!\n",
+	      linenum, poname);
+      break;
+    }
+
+    *ptr = '\0';
+
+   /*
+    * Find start of value...
+    */
+
+    if ((ptr = strchr(line, '\"')) == NULL)
+    {
+      fprintf(stderr, "DEBUG: Expected quoted string on line %d of %s!\n",
+	      linenum, poname);
+      break;
+    }
+
+    ptr ++;
+
+   /*
+    * Create or add to a message...
+    */
+
+    if (!strncmp(line, "msgid", 5))
+    {
+      in_id  = 1;
+      in_str = 0;
+
+      if (id[0] && str[0])
+      {
+        stpi_unquote(id);
+
+        if (ic)
+	{
+	 /*
+	  * Convert string to UTF-8...
+	  */
+
+	  inbytes  = strlen(str);
+	  inptr    = str;
+	  outbytes = sizeof(utf8str);
+	  outptr   = utf8str;
+
+          iconv(ic, &inptr, &inbytes, &outptr, &outbytes);
+	  *outptr = '\0';
+
+	 /*
+	  * Add it to the string list...
+	  */
+
+          stpi_unquote(utf8str);
+          stp_string_list_add_string(po, id, utf8str);
+	}
+	else
+	{
+          stpi_unquote(str);
+          stp_string_list_add_string(po, id, str);
+        }
+      }
+      else if (!id[0] && str[0] && !ic)
+      {
+       /*
+        * Look for the character set...
+	*/
+
+	const char	*charset = strstr(str, "charset=");
+					/* Source character set definition */
+	char		fromcode[255],	/* Source character set */
+			*fromptr;	/* Pointer into fromcode */
+
+	if (charset)
+	{
+	 /*
+	  * Extract character set and setup a transcode context...
+	  */
+
+	  strncpy(fromcode, charset + 8, sizeof(fromcode) - 1);
+	  fromcode[sizeof(fromcode) - 1] = '\0';
+          for (fromptr = fromcode; *fromptr; fromptr ++)
+	    if (!isalnum(*fromptr & 255) && *fromptr != '-')
+	      break;
+          *fromptr = '\0';
+
+          if (strcasecmp(fromcode, "utf-8"))
+	  {
+            if ((ic = iconv_open("UTF-8", fromcode)) == (iconv_t)-1)
+	    {
+	      fprintf(stderr,
+	              "DEBUG: Unable to convert character set \"%s\": %s\n",
+	              fromcode, strerror(errno));
+	      ic = 0;
+	    }
+	  }
+        }
+      }
+
+      strncpy(id, ptr, sizeof(id) - 1);
+      id[sizeof(id) - 1] = '\0';
+      str[0] = '\0';
+    }
+    else if (!strncmp(line, "msgstr", 6))
+    {
+      in_id  = 0;
+      in_str = 1;
+
+      strncpy(str, ptr, sizeof(str) - 1);
+      str[sizeof(str) - 1] = '\0';
+    }
+    else if (line[0] == '\"' && in_str)
+    {
+      int	str_len = strlen(str),
+		ptr_len = strlen(ptr);
+
+
+      if ((str_len + ptr_len + 1) > sizeof(str))
+        ptr_len = sizeof(str) - str_len - 1;
+
+      if (ptr_len > 0)
+      {
+        memcpy(str + str_len, ptr, ptr_len);
+	str[str_len + ptr_len] = '\0';
+      }
+    }
+    else if (line[0] == '\"' && in_id)
+    {
+      int	id_len = strlen(id),
+		ptr_len = strlen(ptr);
+
+
+      if ((id_len + ptr_len + 1) > sizeof(id))
+        ptr_len = sizeof(id) - id_len - 1;
+
+      if (ptr_len > 0)
+      {
+        memcpy(id + id_len, ptr, ptr_len);
+	id[id_len + ptr_len] = '\0';
+      }
+    }
+    else
+    {
+      fprintf(stderr, "DEBUG: Unexpected text on line %d of %s!\n",
+	      linenum, poname);
+      break;
+    }
+  }
+
+  if (id[0] && str[0])
+  {
+    stpi_unquote(id);
+
+    if (ic)
+    {
+     /*
+      * Convert string to UTF-8...
+      */
+
+      inbytes  = strlen(str);
+      inptr    = str;
+      outbytes = sizeof(utf8str);
+      outptr   = utf8str;
+
+      iconv(ic, &inptr, &inbytes, &outptr, &outbytes);
+      *outptr = '\0';
+
+     /*
+      * Add it to the string list...
+      */
+
+      stpi_unquote(utf8str);
+      stp_string_list_add_string(po, id, utf8str);
+    }
+    else
+    {
+      stpi_unquote(str);
+      stp_string_list_add_string(po, id, str);
+    }
+  }
+
+  fclose(pofile);
+
+ /*
+  * Add this to the cache...
+  */
+
+  if ((pocache = calloc(1, sizeof(stpi_i18n_t))) != NULL)
+  {
+    strncpy(pocache->locale, locale, sizeof(pocache->locale) - 1);
+    pocache->po   = po;
+    pocache->next = stpi_pocache;
+    stpi_pocache  = pocache;
+  }
+  
+  return (po);
+}
+
+
+/*
+ * 'stp_i18n_lookup()' - Lookup a string in the message catalog...
+ */
+
+const char *				/* O - Localized message */
+stp_i18n_lookup(
+    stp_string_list_t *po,		/* I - Message catalog */
+    const char        *message)		/* I - Message */
+{
+  stp_param_string_t	*param;		/* Matching message */
+
+
+  if (po && (param = stp_string_list_find(po, message)) != NULL && param->text)
+    return (param->text);
+  else
+    return (message);
+}
+
+
+/*
+ * 'stp_i18n_printf()' - Send a formatted string to stderr.
+ */
+
+void
+stp_i18n_printf(
+    stp_string_list_t *po,		/* I - Message catalog */
+    const char        *message,		/* I - Printf-style message */
+    ...)				/* I - Additional arguments as needed */
+{
+  va_list	ap;			/* Argument pointer */
+
+
+  va_start(ap, message);
+  vfprintf(stderr, stp_i18n_lookup(po, message), ap);
+  va_end(ap);
+}
+
+
+/*
+ * 'stpi_unquote()' - Unquote characters in strings.
+ */
+
+static void
+stpi_unquote(char *s)		/* IO - Original string */
+{
+  char	*d = s;			/* Destination pointer */
+
+
+  while (*s)
+  {
+    if (*s == '\\')
+    {
+      s ++;
+      if (isdigit(*s))
+      {
+	*d = 0;
+
+	while (isdigit(*s))
+	{
+	  *d = *d * 8 + *s - '0';
+	  s ++;
+	}
+
+	d ++;
+      }
+      else
+      {
+	if (*s == 'n')
+	  *d ++ = '\n';
+	else if (*s == 'r')
+	  *d ++ = '\r';
+	else if (*s == 't')
+	  *d ++ = '\t';
+	else
+	  *d++ = *s;
+
+	s ++;
+      }
+    }
+    else
+      *d++ = *s++;
+  }
+
+  *d = '\0';
+}
+
+
+/*
+ * End of "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $".
+ */
diff --git a/src/cups/i18n.h b/src/cups/i18n.h
new file mode 100644
index 0000000..f5ae7af
--- /dev/null
+++ b/src/cups/i18n.h
@@ -0,0 +1,47 @@
+/*
+ * "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $"
+ *
+ *   Internationalization definitions for CUPS drivers.
+ *
+ *   Copyright 2008 Michael Sweet (mike@easysw.com)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 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.
+ */
+
+#include <gutenprint/gutenprint.h>
+#include <gutenprint/string-list.h>
+
+
+/*
+ * Macro for localizing driver messages...
+ */
+
+#define _(x) x
+
+
+/*
+ * Prototypes...
+ */
+
+extern stp_string_list_t	*stp_i18n_load(const char *locale);
+extern const char		*stp_i18n_lookup(stp_string_list_t *po,
+				                 const char *message);
+extern void			stp_i18n_printf(stp_string_list_t *po,
+				                const char *message, ...);
+
+
+/*
+ * End of "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $".
+ */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index 9c25137..cf7cc38 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: rastertoprinter.c,v 1.120 2008/01/02 01:39:06 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.136 2008/10/04 17:47:50 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
- *   Copyright 1993-2007 by Easy Software Products.
+ *   Copyright 1993-2008 by Mike Sweet.
  *
  *   This program is free software; you can redistribute it and/or modify it
  *   under the terms of the GNU General Public License as published by the Free
@@ -47,11 +47,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/times.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#include <gutenprint/gutenprint.h>
+#include "i18n.h"
 
 /* Solaris with gcc has problems because gcc's limits.h doesn't #define */
 /* this */
@@ -113,15 +114,16 @@ 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 void
 set_string_parameter(stp_vars_t *v, const char *name, const char *val)
 {
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   set special string %s to %s\n", name, val);
+    fprintf(stderr, "DEBUG: Gutenprint:   Set special string %s to %s\n", name, val);
   stp_set_string_parameter(v, name, val);
 }
-  
+
 
 static void
 set_special_parameter(stp_vars_t *v, const char *name, int choice)
@@ -134,21 +136,22 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
 	{
 	  stp_clear_string_parameter(v, name);
 	  if (! suppress_messages)
-	    fprintf(stderr, "DEBUG: Gutenprint   clear special parameter %s\n",
+	    fprintf(stderr, "DEBUG: Gutenprint:   Clear special parameter %s\n",
 		    name);
 	}
       else if (choice >= stp_string_list_count(desc.bounds.str))
 	{
 	  if (! suppress_messages)
-	    fprintf(stderr, "ERROR: Gutenprint   UNABLE to set %s (%d > %d)!\n",
-		    name, choice, stp_string_list_count(desc.bounds.str));
+	    stp_i18n_printf(po, _("ERROR: Unable to set Gutenprint option %s "
+	                          "(%d > %d)!\n"), name, choice,
+				  stp_string_list_count(desc.bounds.str));
 	}
       else
 	{
 	  stp_set_string_parameter
 	    (v, name, stp_string_list_param(desc.bounds.str, choice)->name);
 	  if (! suppress_messages)
-	    fprintf(stderr, "DEBUG: Gutenprint   set special parameter %s to choice %d (%s)\n",
+	    fprintf(stderr, "DEBUG: Gutenprint:   Set special parameter %s to choice %d (%s)\n",
 		    name, choice,
 		    stp_string_list_param(desc.bounds.str, choice)->name);
 	}
@@ -156,7 +159,7 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
   else
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   UNABLE to set special %s: not a string\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Unable to set special %s: not a string\n",
 		name);
     }
   stp_parameter_description_destroy(&desc);
@@ -168,62 +171,62 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
   stp_parameter_list_t params;
   int nparams;
   int i;
-  fprintf(stderr, "DEBUG: Gutenprint   Page data:\n");
-  fprintf(stderr, "DEBUG: Gutenprint     MediaClass = \"%s\"\n", cups->header.MediaClass);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaColor = \"%s\"\n", cups->header.MediaColor);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaType = \"%s\"\n", cups->header.MediaType);
-  fprintf(stderr, "DEBUG: Gutenprint     OutputType = \"%s\"\n", cups->header.OutputType);
-
-  fprintf(stderr, "DEBUG: Gutenprint     AdvanceDistance = %d\n", cups->header.AdvanceDistance);
-  fprintf(stderr, "DEBUG: Gutenprint     AdvanceMedia = %d\n", cups->header.AdvanceMedia);
-  fprintf(stderr, "DEBUG: Gutenprint     Collate = %d\n", cups->header.Collate);
-  fprintf(stderr, "DEBUG: Gutenprint     CutMedia = %d\n", cups->header.CutMedia);
-  fprintf(stderr, "DEBUG: Gutenprint     Duplex = %d\n", cups->header.Duplex);
-  fprintf(stderr, "DEBUG: Gutenprint     HWResolution = [ %d %d ]\n", cups->header.HWResolution[0],
+  fprintf(stderr, "DEBUG: Gutenprint: Page data:\n");
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaClass = \"%s\"\n", cups->header.MediaClass);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaColor = \"%s\"\n", cups->header.MediaColor);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaType = \"%s\"\n", cups->header.MediaType);
+  fprintf(stderr, "DEBUG: Gutenprint:   OutputType = \"%s\"\n", cups->header.OutputType);
+
+  fprintf(stderr, "DEBUG: Gutenprint:   AdvanceDistance = %d\n", cups->header.AdvanceDistance);
+  fprintf(stderr, "DEBUG: Gutenprint:   AdvanceMedia = %d\n", cups->header.AdvanceMedia);
+  fprintf(stderr, "DEBUG: Gutenprint:   Collate = %d\n", cups->header.Collate);
+  fprintf(stderr, "DEBUG: Gutenprint:   CutMedia = %d\n", cups->header.CutMedia);
+  fprintf(stderr, "DEBUG: Gutenprint:   Duplex = %d\n", cups->header.Duplex);
+  fprintf(stderr, "DEBUG: Gutenprint:   HWResolution = [ %d %d ]\n", cups->header.HWResolution[0],
 	  cups->header.HWResolution[1]);
-  fprintf(stderr, "DEBUG: Gutenprint     ImagingBoundingBox = [ %d %d %d %d ]\n",
+  fprintf(stderr, "DEBUG: Gutenprint:   ImagingBoundingBox = [ %d %d %d %d ]\n",
 	  cups->header.ImagingBoundingBox[0], cups->header.ImagingBoundingBox[1],
 	  cups->header.ImagingBoundingBox[2], cups->header.ImagingBoundingBox[3]);
-  fprintf(stderr, "DEBUG: Gutenprint     InsertSheet = %d\n", cups->header.InsertSheet);
-  fprintf(stderr, "DEBUG: Gutenprint     Jog = %d\n", cups->header.Jog);
-  fprintf(stderr, "DEBUG: Gutenprint     LeadingEdge = %d\n", cups->header.LeadingEdge);
-  fprintf(stderr, "DEBUG: Gutenprint     Margins = [ %d %d ]\n", cups->header.Margins[0],
+  fprintf(stderr, "DEBUG: Gutenprint:   InsertSheet = %d\n", cups->header.InsertSheet);
+  fprintf(stderr, "DEBUG: Gutenprint:   Jog = %d\n", cups->header.Jog);
+  fprintf(stderr, "DEBUG: Gutenprint:   LeadingEdge = %d\n", cups->header.LeadingEdge);
+  fprintf(stderr, "DEBUG: Gutenprint:   Margins = [ %d %d ]\n", cups->header.Margins[0],
 	  cups->header.Margins[1]);
-  fprintf(stderr, "DEBUG: Gutenprint     ManualFeed = %d\n", cups->header.ManualFeed);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaPosition = %d\n", cups->header.MediaPosition);
-  fprintf(stderr, "DEBUG: Gutenprint     MediaWeight = %d\n", cups->header.MediaWeight);
-  fprintf(stderr, "DEBUG: Gutenprint     MirrorPrint = %d\n", cups->header.MirrorPrint);
-  fprintf(stderr, "DEBUG: Gutenprint     NegativePrint = %d\n", cups->header.NegativePrint);
-  fprintf(stderr, "DEBUG: Gutenprint     NumCopies = %d\n", cups->header.NumCopies);
-  fprintf(stderr, "DEBUG: Gutenprint     Orientation = %d\n", cups->header.Orientation);
-  fprintf(stderr, "DEBUG: Gutenprint     OutputFaceUp = %d\n", cups->header.OutputFaceUp);
-  fprintf(stderr, "DEBUG: Gutenprint     PageSize = [ %d %d ]\n", cups->header.PageSize[0],
+  fprintf(stderr, "DEBUG: Gutenprint:   ManualFeed = %d\n", cups->header.ManualFeed);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaPosition = %d\n", cups->header.MediaPosition);
+  fprintf(stderr, "DEBUG: Gutenprint:   MediaWeight = %d\n", cups->header.MediaWeight);
+  fprintf(stderr, "DEBUG: Gutenprint:   MirrorPrint = %d\n", cups->header.MirrorPrint);
+  fprintf(stderr, "DEBUG: Gutenprint:   NegativePrint = %d\n", cups->header.NegativePrint);
+  fprintf(stderr, "DEBUG: Gutenprint:   NumCopies = %d\n", cups->header.NumCopies);
+  fprintf(stderr, "DEBUG: Gutenprint:   Orientation = %d\n", cups->header.Orientation);
+  fprintf(stderr, "DEBUG: Gutenprint:   OutputFaceUp = %d\n", cups->header.OutputFaceUp);
+  fprintf(stderr, "DEBUG: Gutenprint:   PageSize = [ %d %d ]\n", cups->header.PageSize[0],
 	  cups->header.PageSize[1]);
-  fprintf(stderr, "DEBUG: Gutenprint     Separations = %d\n", cups->header.Separations);
-  fprintf(stderr, "DEBUG: Gutenprint     TraySwitch = %d\n", cups->header.TraySwitch);
-  fprintf(stderr, "DEBUG: Gutenprint     Tumble = %d\n", cups->header.Tumble);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsWidth = %d\n", cups->header.cupsWidth);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsHeight = %d\n", cups->header.cupsHeight);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->width = %d\n", cups->width);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->height = %d\n", cups->height);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->adjusted_width = %d\n", cups->adjusted_width);
-  fprintf(stderr, "DEBUG: Gutenprint     cups->adjusted_height = %d\n", cups->adjusted_height);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsMediaType = %d\n", cups->header.cupsMediaType);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsBitsPerColor = %d\n", cups->header.cupsBitsPerColor);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsBitsPerPixel = %d\n", cups->header.cupsBitsPerPixel);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsBytesPerLine = %d\n", cups->header.cupsBytesPerLine);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsColorOrder = %d\n", cups->header.cupsColorOrder);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsColorSpace = %d\n", cups->header.cupsColorSpace);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsCompression = %d\n", cups->header.cupsCompression);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsRowCount = %d\n", cups->header.cupsRowCount);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsRowFeed = %d\n", cups->header.cupsRowFeed);
-  fprintf(stderr, "DEBUG: Gutenprint     cupsRowStep = %d\n", cups->header.cupsRowStep);
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_driver(v) |%s|\n", stp_get_driver(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_left(v) %d\n", stp_get_left(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_top(v) %d\n", stp_get_top(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_page_width(v) %d\n", stp_get_page_width(v));
-  fprintf(stderr, "DEBUG: Gutenprint     stp_get_page_height(v) %d\n", stp_get_page_height(v));
-  fprintf(stderr, "DEBUG: Gutenprint     shrink page to fit %d\n", cups->shrink_to_fit);
+  fprintf(stderr, "DEBUG: Gutenprint:   Separations = %d\n", cups->header.Separations);
+  fprintf(stderr, "DEBUG: Gutenprint:   TraySwitch = %d\n", cups->header.TraySwitch);
+  fprintf(stderr, "DEBUG: Gutenprint:   Tumble = %d\n", cups->header.Tumble);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsWidth = %d\n", cups->header.cupsWidth);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsHeight = %d\n", cups->header.cupsHeight);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->width = %d\n", cups->width);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->height = %d\n", cups->height);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->adjusted_width = %d\n", cups->adjusted_width);
+  fprintf(stderr, "DEBUG: Gutenprint:   cups->adjusted_height = %d\n", cups->adjusted_height);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsMediaType = %d\n", cups->header.cupsMediaType);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsBitsPerColor = %d\n", cups->header.cupsBitsPerColor);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsBitsPerPixel = %d\n", cups->header.cupsBitsPerPixel);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsBytesPerLine = %d\n", cups->header.cupsBytesPerLine);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsColorOrder = %d\n", cups->header.cupsColorOrder);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsColorSpace = %d\n", cups->header.cupsColorSpace);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsCompression = %d\n", cups->header.cupsCompression);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsRowCount = %d\n", cups->header.cupsRowCount);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsRowFeed = %d\n", cups->header.cupsRowFeed);
+  fprintf(stderr, "DEBUG: Gutenprint:   cupsRowStep = %d\n", cups->header.cupsRowStep);
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_driver(v) |%s|\n", stp_get_driver(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_left(v) %d\n", stp_get_left(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_top(v) %d\n", stp_get_top(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_page_width(v) %d\n", stp_get_page_width(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_page_height(v) %d\n", stp_get_page_height(v));
+  fprintf(stderr, "DEBUG: Gutenprint:   shrink page to fit %d\n", cups->shrink_to_fit);
   params = stp_get_parameter_list(v);
   nparams = stp_parameter_list_count(params);
   for (i = 0; i < nparams; i++)
@@ -232,28 +235,28 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
       switch (p->p_type)
 	{
 	case STP_PARAMETER_TYPE_STRING_LIST:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_string %s(v) |%s| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_string %s(v) |%s| %d\n",
 		  p->name, stp_get_string_parameter(v, p->name) ?
 		  stp_get_string_parameter(v, p->name) : "NULL",
 		  stp_get_string_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_DOUBLE:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_float %s(v) |%.3f| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_float %s(v) |%.3f| %d\n",
 		  p->name, stp_get_float_parameter(v, p->name),
 		  stp_get_float_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_DIMENSION:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_dimension %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_dimension %s(v) |%d| %d\n",
 		  p->name, stp_get_dimension_parameter(v, p->name),
 		  stp_get_dimension_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_INT:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_int %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_int %s(v) |%d| %d\n",
 		  p->name, stp_get_int_parameter(v, p->name),
 		  stp_get_int_parameter_active(v, p->name));
 	  break;
 	case STP_PARAMETER_TYPE_BOOLEAN:
-	  fprintf(stderr, "DEBUG: Gutenprint     stp_get_boolean %s(v) |%d| %d\n",
+	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_boolean %s(v) |%d| %d\n",
 		  p->name, stp_get_boolean_parameter(v, p->name),
 		  stp_get_boolean_parameter_active(v, p->name));
 	  break;
@@ -264,7 +267,7 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
 	  break;
 	}
     }
-  fprintf(stderr, "DEBUG: Gutenprint   End page data\n");
+  fprintf(stderr, "DEBUG: Gutenprint: End page data\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -287,7 +290,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);
@@ -301,14 +304,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)
@@ -318,7 +321,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);
@@ -326,7 +329,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);
@@ -338,22 +341,20 @@ 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);
-}  
+}
 
 static stp_vars_t *
-initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
+initialize_page(cups_image_t *cups, const stp_vars_t *default_settings,
+		const char *page_size_name)
 {
-  const stp_papersize_t	*size;		/* Paper size */
   int tmp_left, tmp_right, tmp_top, tmp_bottom, tmp_width, tmp_height;
   stp_vars_t *v = stp_vars_create_copy(default_settings);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint  Initialize page\n");
+    fprintf(stderr, "DEBUG: Gutenprint: Initialize page\n");
 
-  stp_set_page_width(v, cups->header.PageSize[0]);
-  stp_set_page_height(v, cups->header.PageSize[1]);
   stp_set_outfunc(v, cups_writefunc);
   stp_set_errfunc(v, cups_errfunc);
   stp_set_outdata(v, stdout);
@@ -394,8 +395,8 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       set_string_parameter(v, "InputImageType", "KCMY");
       break;
     default :
-      fprintf(stderr, "ERROR: Gutenprint Bad colorspace %d!\n",
-	      cups->header.cupsColorSpace);
+      stp_i18n_printf(po, _("ERROR: Gutenprint detected a bad colorspace "
+                            "(%d)!\n"), cups->header.cupsColorSpace);
       break;
     }
 
@@ -410,17 +411,52 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
     set_string_parameter(v, "MediaType", cups->header.MediaType);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint   PageSize = %dx%d\n", cups->header.PageSize[0],
+    fprintf(stderr, "DEBUG: Gutenprint:   PageSize = %dx%d\n", cups->header.PageSize[0],
 	    cups->header.PageSize[1]);
 
-  if ((size = stp_get_papersize_by_size(cups->header.PageSize[1],
-					cups->header.PageSize[0])) != NULL)
-    set_string_parameter(v, "PageSize", size->name);
+  if (page_size_name)
+    {
+      if (strcmp(page_size_name, "Custom") == 0)
+	{
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Using custom page size for (%d, %d)\n",
+		    cups->header.PageSize[1], cups->header.PageSize[0]);
+	  stp_set_page_width(v, cups->header.PageSize[0]);
+	  stp_set_page_height(v, cups->header.PageSize[1]);
+	}
+      else if (stp_get_papersize_by_name(page_size_name))
+	{
+	  int width, height;
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Using page size %s with (%d, %d)\n",
+		    page_size_name, cups->header.PageSize[1], cups->header.PageSize[0]);
+	  set_string_parameter(v, "PageSize", page_size_name);
+	  stp_get_media_size(v, &width, &height);
+	  if (width > 0)
+	    stp_set_page_width(v, width);
+	  else
+	    stp_set_page_width(v, cups->header.PageSize[0]);
+	  if (height > 0)
+	    stp_set_page_height(v, height);
+	  else
+	    stp_set_page_height(v, cups->header.PageSize[1]);
+	}
+      else
+	{
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Can't find page size %s with (%d, %d), using custom page size\n",
+		    page_size_name, cups->header.PageSize[1], cups->header.PageSize[0]);
+	  stp_set_page_width(v, cups->header.PageSize[0]);
+	  stp_set_page_height(v, cups->header.PageSize[1]);
+	}
+    }
   else
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   UNABLE to get media size for (%d, %d)\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   No named media size for (%d, %d)\n",
 		cups->header.PageSize[1], cups->header.PageSize[0]);
+      stp_set_page_width(v, cups->header.PageSize[0]);
+      stp_set_page_height(v, cups->header.PageSize[1]);
     }
 
  /*
@@ -447,9 +483,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);
     }
 
@@ -473,13 +509,13 @@ 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
     {
       cups->left_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting left margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting left margin from %d to %d\n",
 		cups->left, tmp_left);
       cups->left = tmp_left;
     }
@@ -493,13 +529,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->right_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   right margin %d\n", cups->right_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   right margin %d\n", cups->right_trim);
     }
   else
     {
       cups->right_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting right margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting right margin from %d to %d\n",
 		cups->right, tmp_right);
       cups->right = tmp_right;
     }
@@ -513,13 +549,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->top_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   top margin %d\n", cups->top_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   top margin %d\n", cups->top_trim);
     }
   else
     {
       cups->top_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting top margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting top margin from %d to %d\n",
 		cups->top, tmp_top);
       cups->top = tmp_top;
     }
@@ -533,13 +569,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       else
 	cups->bottom_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   bottom margin %d\n", cups->bottom_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   bottom margin %d\n", cups->bottom_trim);
     }
   else
     {
       cups->bottom_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint   adjusting bottom margin from %d to %d\n",
+	fprintf(stderr, "DEBUG: Gutenprint:   Adjusting bottom margin from %d to %d\n",
 		cups->bottom, tmp_bottom);
       cups->bottom = tmp_bottom;
     }
@@ -589,12 +625,12 @@ 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",
+    fprintf(stderr, "DEBUG: Gutenprint:   CUPS settings w %d (%d) l %d r %d  h %d (%d) t %d b %d\n",
 	    cups->width, cups->adjusted_width, cups->left, cups->right,
 	    cups->height, cups->adjusted_height, cups->top, cups->bottom);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint  End initialize page\n");
+    fprintf(stderr, "DEBUG: Gutenprint: End initialize page\n");
   return v;
 }
 
@@ -605,7 +641,7 @@ purge_excess_data(cups_image_t *cups)
   if (buffer)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint purging %d rows\n",
+	fprintf(stderr, "DEBUG: Gutenprint: Purging %d rows\n",
 		cups->header.cupsHeight - cups->row);
       while (cups->row < cups->header.cupsHeight)
 	{
@@ -627,7 +663,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
   const char *val;		/* CUPS option value */
   ppd_option_t *ppd_option;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint set options:\n");
+    fprintf(stderr, "DEBUG: Gutenprint: Set options:\n");
   val = cupsGetOption("StpiShrinkOutput", num_options, options);
   if (!val)
     {
@@ -668,7 +704,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	      double dval = atof(val + 7);
 
 	      if (! suppress_messages)
-		fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f\n",
+		fprintf(stderr, "DEBUG: Gutenprint:   Set float %s to %f\n",
 			desc.name, dval);
 	      if (dval > desc.bounds.dbl.upper)
 		dval = desc.bounds.dbl.upper;
@@ -681,7 +717,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		{
 		  fine_val = atof(val);
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f (%s)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set float %s to %f (%s)\n",
 			    desc.name, fine_val, val);
 		}
 	      else
@@ -698,7 +734,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		  if (val && strlen(val) > 0 && strcmp(val, "None") != 0)
 		    fine_val = atof(val) * 0.001;
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set float %s to %f + %f\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set float %s to %f + %f\n",
 			    desc.name, coarse_val, fine_val);
 		  fine_val += coarse_val;
 		}
@@ -726,7 +762,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		{
 		case STP_PARAMETER_TYPE_STRING_LIST:
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set string %s to %s\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set string %s to %s\n",
 			    desc.name, val);
 		  set_string_parameter(v, desc.name, val);
 		  break;
@@ -735,7 +771,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		    val += 7;
 
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set int %s to %s (%d)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set int %s to %s (%d)\n",
 			    desc.name, val, atoi(val));
 		  stp_set_int_parameter(v, desc.name, atoi(val));
 		  break;
@@ -744,14 +780,14 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		    val += 7;
 
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set dimension %s to %s (%d)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set dimension %s to %s (%d)\n",
 			    desc.name, val, atoi(val));
 
 		  stp_set_dimension_parameter(v, desc.name, atoi(val));
 		  break;
 		case STP_PARAMETER_TYPE_BOOLEAN:
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   set bool %s to %s (%d)\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set bool %s to %s (%d)\n",
 			    desc.name, val, strcasecmp(val, "true") == 0 ? 1 : 0);
 		  stp_set_boolean_parameter
 		    (v, desc.name, strcasecmp(val, "true") == 0 ? 1 : 0);
@@ -760,7 +796,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		case STP_PARAMETER_TYPE_FILE: /* Probably not, security hole */
 		case STP_PARAMETER_TYPE_RAW: /* figure this out later, too */
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint   ignoring option %s %s type %d\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:   Ignoring option %s %s type %d\n",
 			    desc.name, val, desc.p_type);
 		  break;
 		default:
@@ -770,13 +806,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);
 	    }
 	}
@@ -784,7 +820,7 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
       stp_free(ppd_option_name);
     }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint end options\n");
+    fprintf(stderr, "DEBUG: Gutenprint: End options\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -800,6 +836,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   cups_image_t		cups;		/* CUPS image */
   const char		*ppdfile;	/* PPD environment variable */
   ppd_file_t		*ppd;		/* PPD file */
+  ppd_size_t		*size;
   const stp_printer_t	*printer;	/* Printer driver */
   int			num_options;	/* Number of CUPS options */
   cups_option_t		*options;	/* CUPS options */
@@ -813,14 +850,24 @@ main(int  argc,				/* I - Number of command-line arguments */
   long			clocks_per_sec;
   struct timeval	t1, t2;
   struct timezone	tz;
+  char			*page_size_name = NULL;
+
+
+ /*
+  * Don't buffer error/status messages...
+  */
+
+  setbuf(stderr, NULL);
 
   if (getenv("STP_SUPPRESS_MESSAGES"))
     suppress_messages = 1;
 
  /*
-  * Initialise libgutenprint
+  * Initialize libgutenprint
   */
 
+  po = stp_i18n_load(getenv("LANG"));
+
   theImage.rep = &cups;
 
   (void) gettimeofday(&t1, &tz);
@@ -828,12 +875,10 @@ main(int  argc,				/* I - Number of command-line arguments */
   version_id = stp_get_version();
   release_version_id = stp_get_release_version();
   default_settings = stp_vars_create();
+
  /*
   * Check for valid arguments...
   */
-  if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint %s Starting\n", version_id);
-
   if (argc < 6 || argc > 7)
   {
    /*
@@ -841,7 +886,8 @@ main(int  argc,				/* I - Number of command-line arguments */
     * and return.
     */
 
-    fputs("ERROR: Gutenprint rastertoprinter job-id user title copies options [file]\n", stderr);
+    stp_i18n_printf(po, _("Usage: rastertoprinter job-id user title copies "
+                          "options [file]\n"));
     return (1);
   }
 
@@ -861,7 +907,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if ((ppdfile = getenv("PPD")) == NULL)
   {
-    fputs("ERROR: Gutenprint Fatal error: PPD environment variable not set!\n", stderr);
+    stp_i18n_printf(po, _("ERROR: No PPD file, unable to continue!\n"));
     return (1);
   }
   if (! suppress_messages)
@@ -869,31 +915,31 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if ((ppd = ppdOpenFile(ppdfile)) == NULL)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: Unable to load PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint was unable to load PPD file "
+                          "\"%s\"!\n"), ppdfile);
     return (1);
   }
 
   if (ppd->modelname == NULL)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: No ModelName attribute in PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint did not find a ModelName "
+                          "attribute in PPD file \"%s\"!\n"), ppdfile);
     ppdClose(ppd);
     return (1);
   }
 
   if (ppd->nickname == NULL)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: No NickName attribute in PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint did not find a NickName attribute "
+                          "in PPD file \"%s\"!\n"), ppdfile);
     ppdClose(ppd);
     return (1);
   }
   else if (strlen(ppd->nickname) <
 	   strlen(ppd->modelname) + strlen(CUPS_PPD_NICKNAME_STRING) + 3)
   {
-    fprintf(stderr, "ERROR: Gutenprint Fatal error: Corrupted NickName attribute in PPD file \"%s\"!\n",
-            ppdfile);
+    stp_i18n_printf(po, _("ERROR: Gutenprint found a corrupted NickName "
+                          "attribute in PPD file \"%s\"!\n"), ppdfile);
     ppdClose(ppd);
     return (1);
   }
@@ -907,22 +953,17 @@ main(int  argc,				/* I - Number of command-line arguments */
 	      *(ppd->nickname + strlen(ppd->modelname) +
 		strlen(CUPS_PPD_NICKNAME_STRING)) != ' ')))
   {
-    fprintf(stderr, "ERROR: Gutenprint: The version of Gutenprint software installed (%s) does not match the PPD file (%s).\n",
-	    version_id,
-	    ppd->nickname+strlen(ppd->modelname)+strlen(CUPS_PPD_NICKNAME_STRING));
-    fprintf(stderr, "ERROR: Gutenprint: If you have upgraded your version of Gutenprint\n");
-    fprintf(stderr, "ERROR: Gutenprint: recently, you must reinstall all printer queues.\n");
-    fprintf(stderr, "ERROR: Gutenprint: If the previous installed version of Gutenprint\n");
-    fprintf(stderr, "ERROR: Gutenprint: was 4.3.19 or higher, you can use the `cups-genppdupdate.%s'\n", release_version_id);
-    fprintf(stderr, "ERROR: Gutenprint: program to do this; if the previous installed version\n");
-    fprintf(stderr, "ERROR: Gutenprint: was older, you can use the Modify Printer command via\n");
-    fprintf(stderr, "ERROR: Gutenprint: the CUPS web interface: http://localhost:631/printers.\n");
-    /*
-     * Repeat the first line of the message so that CUPS will display it
-     */
-    fprintf(stderr, "ERROR: Gutenprint: The version of Gutenprint software installed (%s) does not match the PPD file (%s).\n",
-	    version_id,
-	    ppd->nickname+strlen(ppd->modelname)+strlen(CUPS_PPD_NICKNAME_STRING));
+    stp_i18n_printf(po, _("ERROR: The PPD version (%d) is not compatible with "
+                          "Gutenprint %s.\n"),
+	            ppd->nickname+strlen(ppd->modelname)+strlen(CUPS_PPD_NICKNAME_STRING),
+	            version_id);
+    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: 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");
     ppdClose(ppd);
     return 1;
   }
@@ -932,17 +973,23 @@ main(int  argc,				/* I - Number of command-line arguments */
   */
 
   num_options = cupsParseOptions(argv[5], 0, &options);
+  ppdMarkDefaults(ppd);
+  cupsMarkOptions(ppd, num_options, options);
+  size = ppdPageSize(ppd, NULL);
+
+  if (size->name)
+    page_size_name = stp_strdup(size->name);
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint CUPS option count is %d (%d bytes)\n",
-	    num_options, strlen(argv[5]));
+    fprintf(stderr, "DEBUG: Gutenprint: CUPS option count is %d (%d bytes)\n",
+	    num_options, (int)strlen(argv[5]));
 
   if (num_options > 0)
     {
       int i;
       for (i = 0; i < num_options; i++)
 	if (! suppress_messages)
-	  fprintf(stderr, "DEBUG: Gutenprint    CUPS option %d %s = %s\n",
+	  fprintf(stderr, "DEBUG: Gutenprint: CUPS option %d %s = %s\n",
 		  i, options[i].name, options[i].value);
     }
 
@@ -956,13 +1003,13 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if (printer == NULL)
     {
-      fprintf(stderr, "ERROR: Gutenprint Fatal error: Unable to find driver named \"%s\"!\n",
-              ppd->modelname);
+      stp_i18n_printf(po, _("ERROR: Unable to find Gutenprint driver named "
+                            "\"%s\"!\n"), ppd->modelname);
       ppdClose(ppd);
       return (1);
     }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint driver %s\n", ppd->modelname);
+    fprintf(stderr, "DEBUG: Gutenprint: Driver %s\n", ppd->modelname);
 
  /*
   * Open the page stream...
@@ -972,7 +1019,8 @@ main(int  argc,				/* I - Number of command-line arguments */
   {
     if ((fd = open(argv[6], O_RDONLY)) == -1)
     {
-      perror("ERROR: Gutenprint Unable to open raster file - ");
+      stp_i18n_printf(po, _("ERROR: Gutenprint was unable to open raster file "
+                            "\"%s\" - %s"), argv[6], strerror(errno));
       sleep(1);
       return (1);
     }
@@ -980,7 +1028,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   else
     fd = 0;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint using fd %d\n", fd);
+    fprintf(stderr, "DEBUG: Gutenprint: Using fd %d\n", fd);
 
   stp_set_printer_defaults(default_settings, printer);
   stp_set_float_parameter(default_settings, "AppGamma", 1.0);
@@ -997,7 +1045,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   cups.page = 0;
 
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint about to start printing loop.\n");
+    fprintf(stderr, "DEBUG: Gutenprint: About to start printing loop.\n");
 
   /*
    * Read the first page header, which we need in order to set up
@@ -1022,10 +1070,10 @@ 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);
+      v = initialize_page(&cups, default_settings, page_size_name);
       stp_set_int_parameter(v, "PageNumber", cups.page);
       cups.row = 0;
       if (! suppress_messages)
@@ -1033,10 +1081,10 @@ main(int  argc,				/* I - Number of command-line arguments */
       print_messages_as_errors = 1;
       if (!stp_verify(v))
 	{
-	  fprintf(stderr, "ERROR: Gutenprint: options failed to verify.\n");
-	  fprintf(stderr, "ERROR: Gutenprint: Make sure that you are using ESP Ghostscript rather\n");
-	  fprintf(stderr, "ERROR: Gutenprint: than GNU or AFPL Ghostscript with CUPS.\n");
-	  fprintf(stderr, "ERROR: Gutenprint: If this is not the cause, set LogLevel to debug2 to identify the problem.\n");
+	  fprintf(stderr, "DEBUG: Gutenprint: Options failed to verify.\n");
+	  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;
 	}
 
@@ -1047,10 +1095,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 	}
 
       if (!stp_print(v, &theImage))
-	{
-	  fprintf(stderr, "ERROR: Gutenprint failed to print, set LogLevel to debug2 to identify why\n");
 	  goto cups_abort;
-	}
       print_messages_as_errors = 0;
 
       fflush(stdout);
@@ -1061,13 +1106,13 @@ 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: Ending job\n");
       stp_end_job(v, &theImage);
       fflush(stdout);
       stp_vars_destroy(v);
@@ -1076,18 +1121,18 @@ main(int  argc,				/* I - Number of command-line arguments */
   clk = times(&tms);
   (void) gettimeofday(&t2, &tz);
   clocks_per_sec = sysconf(_SC_CLK_TCK);
-  fprintf(stderr, "DEBUG: Gutenprint printed total %.0f bytes\n",
+  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: 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);
-  if (! suppress_messages)
-    fputs("INFO: Gutenprint Ready to print.\n", stderr);
+  stp_vars_destroy(default_settings);
+  if (page_size_name)
+    stp_free(page_size_name);
   if (fd != 0)
     close(fd);
-  stp_vars_destroy(default_settings);
   return 0;
 
 cups_abort:
@@ -1101,16 +1146,17 @@ cups_abort:
   clk = times(&tms);
   (void) gettimeofday(&t2, &tz);
   clocks_per_sec = sysconf(_SC_CLK_TCK);
-  fprintf(stderr, "DEBUG: Gutenprint printed total %.0f bytes\n",
+  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: 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);
-  fputs("ERROR: Gutenprint No pages found!\n", stderr);
-  fputs("ERROR: Gutenprint Invalid printer settings!\n", stderr);
+  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;
@@ -1137,8 +1183,13 @@ cups_errfunc(void *file, const char *buf, size_t bytes)
   FILE *prn = (FILE *)file;
   while (where < bytes)
     {
-      if (print_messages_as_errors)
-	fputs("ERROR: Gutenprint: ", prn);
+      if (bytes - where > 6 && strncmp(buf, "ERROR:", 6) == 0)
+	{
+	  fputs("ERROR: Gutenprint error:", prn);
+	  buf += 6;
+	}
+      else if (print_messages_as_errors)
+	fputs("ERROR: Gutenprint error: ", prn);
       else
 	fputs("DEBUG: Gutenprint internal: ", prn);
       while (next_nl < bytes)
@@ -1172,7 +1223,7 @@ Image_get_appname(stp_image_t *image)		/* I - Image */
 {
   (void)image;
 
-  return ("CUPS 1.1.x driver based on Gutenprint");
+  return ("CUPS driver based on Gutenprint");
 }
 
 
@@ -1213,7 +1264,9 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 
   if ((cups = (cups_image_t *)(image->rep)) == NULL)
     {
-      fprintf(stderr, "ERROR: Gutenprint image is null!  Please report this bug to gimp-print-devel@lists.sourceforge.net\n");
+      stp_i18n_printf(po, _("ERROR: Gutenprint image is not initialized!  "
+                            "Please report this bug to "
+			    "gimp-print-devel@lists.sourceforge.net\n"));
       return STP_IMAGE_STATUS_ABORT;
     }
   bytes_per_line =
@@ -1221,23 +1274,23 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
     CHAR_BIT;
 
   left_margin = ((cups->left_trim * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
-    CHAR_BIT; 
+    CHAR_BIT;
   right_margin = ((cups->right_trim * cups->header.cupsBitsPerPixel) + CHAR_BIT - 1) /
-    CHAR_BIT; 
+    CHAR_BIT;
   margin = cups->header.cupsBytesPerLine - left_margin - bytes_per_line -
     right_margin;
 
   if (cups->row < cups->header.cupsHeight)
   {
     if (! suppress_messages)
-      fprintf(stderr, "DEBUG2: Gutenprint reading %d %d\n",
+      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)
-	      fprintf(stderr, "DEBUG2: Gutenprint tossing left %d (%d)\n",
+	      fprintf(stderr, "DEBUG2: Gutenprint: Tossing left %d (%d)\n",
 		      left_margin, cups->left_trim);
 	    throwaway_data(left_margin, cups);
 	  }
@@ -1246,7 +1299,7 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 	if (margin + right_margin > 0)
 	  {
 	    if (!suppress_messages)
-	      fprintf(stderr, "DEBUG2: Gutenprint tossing right %d (%d) + %d\n",
+	      fprintf(stderr, "DEBUG2: Gutenprint: Tossing right %d (%d) + %d\n",
 		      right_margin, cups->right_trim, margin);
 	    throwaway_data(margin + right_margin, cups);
 	  }
@@ -1267,8 +1320,8 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 	  memset(data, ((1 << CHAR_BIT) - 1), bytes_per_line);
 	  break;
 	default:
-	  fprintf(stderr, "ERROR: Gutenprint Unknown colorspace %d!\n",
-		  cups->header.cupsColorSpace);
+	  stp_i18n_printf(po, _("ERROR: Gutenprint detected a bad colorspace "
+	                        "(%d)!\n"), cups->header.cupsColorSpace);
 	  return STP_IMAGE_STATUS_ABORT;
 	}
     }
@@ -1283,9 +1336,9 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
     {
       if (warned == 0)
 	{
-	  fprintf(stderr,
-		  "WARNING: Gutenprint detected bad CUPS bit depth (1).  "
-		  "Output quality is degraded.  Are you using psnup or non-ADSC PostScript?\n");
+	  fputs(_("WARNING: Gutenprint detected a bad color depth (1).  "
+		  "Output quality is degraded.  Are you using psnup or "
+		  "non-ADSC PostScript?\n"), stderr);
 	  warned = 1;
 	}
       for (i = cups->adjusted_width - 1; i >= 0; i--)
@@ -1301,15 +1354,18 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
   if (new_percent > cups->last_percent)
     {
       if (! suppress_messages)
-	fprintf(stderr, "INFO: Gutenprint Printing page %d, %d%%\n",
-		cups->page + 1, new_percent);
+	{
+	  stp_i18n_printf(po, _("INFO: Printing page %d, %d%%\n"),
+			  cups->page + 1, new_percent);
+	  fprintf(stderr, "ATTR: job-media-progress=%d\n", new_percent);
+	}
       cups->last_percent = new_percent;
     }
 
   if (tmp_image_status != STP_IMAGE_STATUS_OK)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint image status %d\n", tmp_image_status);
+	fprintf(stderr, "DEBUG: Gutenprint: Image status %d\n", tmp_image_status);
     }
   return tmp_image_status;
 }
@@ -1348,7 +1404,7 @@ Image_init(stp_image_t *image)		/* I - Image */
   cups->last_percent = 0;
 
   if (! suppress_messages)
-    fprintf(stderr, "INFO: Starting page %d...\n", cups->page + 1);
+    stp_i18n_printf(po, _("INFO: Starting page %d...\n"), cups->page + 1);
   /* cups->page + 1 because users expect 1-based counting */
 }
 
@@ -1366,7 +1422,7 @@ Image_conclude(stp_image_t *image)	/* I - Image */
     return;
 
   if (! suppress_messages)
-    fprintf(stderr, "INFO: Gutenprint Finished page %d...\n", cups->page + 1);
+    stp_i18n_printf(po, _("INFO: Finished page %d...\n"), cups->page + 1);
 }
 
 /*
@@ -1389,5 +1445,5 @@ Image_width(stp_image_t *image)	/* I - Image */
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.120 2008/01/02 01:39:06 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.136 2008/10/04 17:47:50 rlk Exp $".
  */
diff --git a/src/cups/test-ppds b/src/cups/test-ppds
index 868b072..a5fa5a7 100755
--- a/src/cups/test-ppds
+++ b/src/cups/test-ppds
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-rm -rf ppd ppd-stamp
-
-make ppd
+if [ "$#" = 0 ] ; then
+    echo "Bypassing test-ppds for now due to bugs in cupstestppd!"
+    exit 0
+    rm -rf ppd ppd-stamp
+    make ppd
+fi
 
 ppd_count=`find ppd \( -name '*.ppd.gz' -o -name '*.ppd' \) -print | wc -l`
 
@@ -13,7 +16,13 @@ if [ -z "$failures" ] ; then
     exit 0
 fi
 
-echo $failures | xargs cupstestppd
+# Use this with "normal" PPD files without translated numbers.
+echo $failures | xargs cupstestppd 2>&1 | egrep -v 'Missing "[a-z][a-z](_[A-Z][A-Z])?" translation string for option Stp((Brightness|Contrast|Saturation), choice None|([a-zA-Z0-9]+, choice (-?[0-9]+)))!$' |egrep -v 'Missing cupsICCProfile file'
+
+# Use this with PPD files with translated numbers (genppd -N)
+# With normal globalized PPD files this will yield hundreds of megabytes
+# of errors.
+#echo $failures | xargs cupstestppd 2>&1 |egrep -v 'Missing cupsICCProfile file'
 
 fail_count=`echo "$failures" | wc -l`
 echo "$fail_count/$ppd_count fail"
diff --git a/src/cups/test-rastertogutenprint.in b/src/cups/test-rastertogutenprint.in
index afa38d7..8582037 100755
--- a/src/cups/test-rastertogutenprint.in
+++ b/src/cups/test-rastertogutenprint.in
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!@SHELL@
 
 retval=0
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../main
+    STP_DATA_PATH=`pwd`/../xml
     export STP_DATA_PATH
 fi
 
@@ -14,6 +14,11 @@ fi
 
 single=''
 all_models=''
+verbose=''
+make_ppds=1
+md5dir=''
+outdir=''
+cupsargs=''
 
 usage() {
     echo "Usage: test-rastertogutenprint [-s] [-v|--valgrind]"
@@ -28,6 +33,11 @@ set_args() {
 	    -v|--valgrind) valopts='--tool=memcheck' ; valgrind=`expr $valgrind + 1` ;;
 	    -c|--cachegrind) valopts='--tool=cachegrind'; valgrind=4 ;;
 	    -g|--gdb-attach) valopts='--gdb-attach=yes' ;;
+	    -V|--verbose) verbose=1 ;;
+	    -n|--no-make-ppds) make_ppds='' ;;
+	    -O|--output) shift; outdir="$1" ;;
+	    -o|--option) shift; cupsargs="$cupsargs $1" ;;
+	    -m|--md5dir) shift; md5dir="$1" ;;
 	    --) shift; args="$@"; return ;;
 	    *) return ;;
 	esac
@@ -35,20 +45,47 @@ set_args() {
     done
 }
 
+set_args `getopt vcgsVnO:m:o: "$@"`
 
-set_args `getopt vcgs "$@"`
+if [ -n "$outdir" -a ! -d "$outdir" ] ; then
+    mkdir -p "$outdir"
+fi
+if [ -n "$md5dir" -a ! -d "$md5dir" ] ; then
+    mkdir -p "$md5dir"
+fi
 
 version="@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@";
 cupsdir="@cups_conf_serverbin@/filter"
-pages='24-26'
+if [ -x "$cupsdir/pstoraster" ] ; then
+    pages='page-ranges=24-26 '
+else
+    pages=''
+fi
 
 if [ ! -x "$cupsdir/cgpdftoraster" -a ! -x "$cupsdir/pdftops" ] ; then
     echo 'CUPS does not appear to be installed, skipping test'
     exit 0
 fi
 
-STP_SUPPRESS_MESSAGES=1
-export STP_SUPPRESS_MESSAGES
+cleanup() {
+    if [ -f "$tfile" ] ; then
+	rm -f $tfile
+    fi
+    exit 1
+}
+
+pdftops="`type -p pdftops`"
+
+if [ -n "$pdftops" -a ! -x "$cupsdir/cgpdftoraster" ] ; then
+    tfile=`mktemp`
+    trap cleanup 1 2 3 6 14 15 30
+    $pdftops -f 24 -l 26 ../../doc/gutenprint-users-manual.pdf $tfile
+fi
+
+if [ -z "$verbose" ] ; then
+    STP_SUPPRESS_MESSAGES=1
+    export STP_SUPPRESS_MESSAGES
+fi
 
 is_duplicate() {
     model=`gunzip -c "$1" | grep '^.StpDriverModelFamily' | awk '{print $2}'`
@@ -60,13 +97,20 @@ is_duplicate() {
     all_models="$model $all_models"
 }
 
+# Note that using CUPS arguments may trigger valgrind memory leaks in
+# CUPS.
+#cupsargs='PageSize=Custom.400.00x500.00'
+#cupsargs='PageSize=Custom.324x495 Resolution=180dpi'
+#cupsargs='PageSize=w324h495 Resolution=180dpi'
+#cupsargs='PageSize=A8'
+
 run_rastertogp() {
     case "$valgrind" in
-	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	4) valgrind $valopts ./rastertogutenprint.$version 1 1 1 1 '' ;;
-	*) ./rastertogutenprint.$version 1 1 1 1 '' ;;
+	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" ;;
+	4) valgrind $valopts ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	*) ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
     esac
     if [ $? -ne 0 ] ; then
 	retval=1
@@ -74,8 +118,87 @@ run_rastertogp() {
     exit $retval
 }
 
+get_ppds() {
+    args="$@"
+    if [ -n "$args" ] ; then
+	for f in "$@" ; do
+	    if [ -r "$f" ] ; then
+		echo $f
+	    elif [ -r "ppd/C/$f" ] ; then
+		echo "ppd/C/$f"
+	    elif [ -f "ppd/C/${f}.ppd" ] ; then
+		echo "ppd/C/${f}.ppd"
+	    elif [ -f "ppd/C/${f}.ppd.gz" ] ; then
+		echo "ppd/C/${f}.ppd.gz"
+	    elif [ -f "ppd/C/${f}.ppd.GZ" ] ; then
+		echo "ppd/C/${f}.ppd.GZ"
+	    elif [ -f "ppd/C/${f}.ppd.bz2" ] ; then
+		echo "ppd/C/${f}.ppd.bz2"
+	    elif [ -f "ppd/C/${f}.ppd.BZ2" ] ; then
+		echo "ppd/C/${f}.ppd.BZ2"
+	    elif [ -f "ppd/C/${f}.ppd.z" ] ; then
+		echo "ppd/C/${f}.ppd.z"
+	    elif [ -f "ppd/C/${f}.ppd.Z" ] ; then
+		echo "ppd/C/${f}.ppd.Z"
+	    elif [ -f "ppd/C/stp-${f}.ppd" ] ; then
+		echo "ppd/C/stp-${f}.ppd"
+	    elif [ -f "ppd/C/stp-${f}.ppd.gz" ] ; then
+		echo "ppd/C/stp-${f}.ppd.gz"
+	    elif [ -f "ppd/C/stp-${f}.ppd.GZ" ] ; then
+		echo "ppd/C/stp-${f}.ppd.GZ"
+	    elif [ -f "ppd/C/stp-${f}.ppd.bz2" ] ; then
+		echo "ppd/C/stp-${f}.ppd.bz2"
+	    elif [ -f "ppd/C/stp-${f}.ppd.BZ2" ] ; then
+		echo "ppd/C/stp-${f}.ppd.BZ2"
+	    elif [ -f "ppd/C/stp-${f}.ppd.z" ] ; then
+		echo "ppd/C/stp-${f}.ppd.z"
+	    elif [ -f "ppd/C/stp-${f}.ppd.Z" ] ; then
+		echo "ppd/C/stp-${f}.ppd.Z"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.gz" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.gz"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.GZ" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.GZ"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.bz2" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.bz2"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.BZ2" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.BZ2"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.z" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.z"
+	    elif [ -f "ppd/C/stp-${f}.${version}.ppd.Z" ] ; then
+		echo "ppd/C/stp-${f}.${version}.ppd.Z"
+	    fi
+	done
+    else
+	echo ppd/C/*.ppd*
+    fi
+}
+
+if [ -n "$make_ppds" -o ! -d ppd/C ] ; then
+    make ppd-nonls
+fi
+
+do_output() {
+    if [ -n "`echo "$PPD" |grep '\.gz$'`" ] ; then
+	driver=`gunzip -c "$PPD" | grep '^\*StpDriverName:' |awk '{print $2}' | sed 's/"//g'`
+    else
+	driver=`grep '^\*StpDriverName:' "$PPD" |awk '{print $2}' | sed 's/"//g'`
+    fi
+    if [ -n "$outdir" ] ; then
+	cat > "$outdir/$driver.prn"
+	if [ -n "$md5dir" ] ; then
+	    (cd "$outdir"; cat "$driver.prn") | md5sum | sed "s/-/\*$driver/" > "$md5dir/$driver.md5"
+	fi
+    elif [ -n "$md5dir" ] ; then
+	cat | md5sum | sed "s/-/\*$driver/" > "$md5dir/$driver.md5"
+    else
+	cat > /dev/null
+    fi
+}
+
 if [ -d ppd/C ] ; then
-    for f in ppd/C/*.ppd* ; do
+    for f in `get_ppds $args` ; do
 	skip=''
 	if [ -n "$single" ] ; then
 	    is_duplicate $f
@@ -85,9 +208,13 @@ if [ -d ppd/C ] ; then
 	    PPD=$f
 	    export PPD
 	    if [ -x "$cupsdir/cgpdftoraster" ] ; then
-		output="`($cupsdir/cgpdftoraster 1 1 1 1 page-ranges=$pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp > /dev/null) 2>&1`"
+		output="`($cupsdir/cgpdftoraster 1 1 1 1 $pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | run_rastertogp | do_output) 2>&1`"
+	    elif [ -f "$tfile" ] ; then
+		output="`($cupsdir/pstops 1 1 1 1 \"$cupsargs\" < $tfile 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
+	    elif [ -x "$cupsdir/pstoraster" ] ; then
+		output="`($cupsdir/pdftops 1 1 1 1 \"$pages$cupsargs\" < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 \"$pages$cupsargs\" 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    else
-		output="`($cupsdir/pdftops 1 1 1 1 page-ranges=$pages < ../../doc/gutenprint-users-manual.pdf 2>/dev/null | $cupsdir/pstops 1 1 1 1 page-ranges=$pages 2>/dev/null | $cupsdir/pstoraster 2>/dev/null | run_rastertogp > /dev/null) 2>&1`"
+		output="`($cupsdir/imagetoraster 1 1 1 1 \"$pages$cupsargs\" < calibrate.ppm 2>/dev/null | run_rastertogp | do_output) 2>&1`"
 	    fi
 	    if [ $? -ne 0 ] ; then
 		retval=1
@@ -100,4 +227,7 @@ if [ -d ppd/C ] ; then
 	fi
     done
 fi
+if [ -f "$tfile" ] ; then
+    rm -f $tfile
+fi
 exit $retval
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 0aeaade..d441e3c 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -45,7 +45,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -61,7 +62,7 @@ am_escputil_OBJECTS = d4lib.$(OBJEXT) escputil.$(OBJEXT)
 escputil_OBJECTS = $(am_escputil_OBJECTS)
 am__DEPENDENCIES_1 =
 escputil_DEPENDENCIES = $(GUTENPRINT_LIBS) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -109,6 +110,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -129,6 +131,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -161,6 +164,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -181,9 +185,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -210,6 +215,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -324,8 +330,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -388,8 +394,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -401,8 +407,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -412,13 +418,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c
index 46e508a..17cd4ae 100644
--- a/src/escputil/d4lib.c
+++ b/src/escputil/d4lib.c
@@ -312,7 +312,6 @@ static int printError(unsigned char errorNb)
    }
    fprintf(stderr,"Unknown IEEE 1284.4 error number %d\n",errorNb);
    return 0;
-   return 1; /* non recoverable error */
 }
 
 
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 4ebdab3..f4fa3c0 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.92 2007/12/26 18:13:02 rlk Exp $"
+ * "$Id: escputil.c,v 1.96 2008/07/05 01:43:26 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -972,22 +972,23 @@ get_printer(int quiet, int fail_if_not_found)
 
 static const char *colors_new[] =
   {
-    N_("Black"),		/* 0 */
-    N_("Photo Black"),		/* 1 */
-    N_("Unknown"),		/* 2 */
-    N_("Cyan"),			/* 3 */
-    N_("Magenta"),		/* 4 */
-    N_("Yellow"),		/* 5 */
-    N_("Light Cyan"),		/* 6 */
-    N_("Light Magenta"),	/* 7 */
-    N_("Unknown"),		/* 8 */
-    N_("Unknown"),		/* 9 */
-    N_("Light Black"),		/* a */
-    N_("Matte Black"),		/* b */
-    N_("Red"),			/* c */
-    N_("Blue"),			/* d */
-    N_("Gloss Optimizer"),	/* e */
-    N_("Light Light Black"),	/* f */
+    N_("Black"),		/* 00 */
+    N_("Photo Black"),		/* 01 */
+    N_("Unknown"),		/* 02 */
+    N_("Cyan"),			/* 03 */
+    N_("Magenta"),		/* 04 */
+    N_("Yellow"),		/* 05 */
+    N_("Light Cyan"),		/* 06 */
+    N_("Light Magenta"),	/* 07 */
+    N_("Unknown"),		/* 08 */
+    N_("Unknown"),		/* 09 */
+    N_("Light Black"),		/* 0a */
+    N_("Matte Black"),		/* 0b */
+    N_("Red"),			/* 0c */
+    N_("Blue"),			/* 0d */
+    N_("Gloss Optimizer"),	/* 0e */
+    N_("Light Light Black"),	/* 0f */
+    N_("Orange"),		/* 10 */
   };
 static int color_count = sizeof(colors_new) / sizeof(const char *);
 
@@ -1006,7 +1007,7 @@ static const char *aux_colors[] =
     N_("Blue"),			/* a */
     NULL,			/* b */
     NULL,			/* c */
-    NULL,			/* d */
+    N_("Orange"),		/* d */
     NULL,			/* e */
     NULL,			/* f */
   };
@@ -1073,18 +1074,33 @@ print_error(int param)
     case 6:
       printf(_("Error: Paper out\n"));
       break;
+    case 0xc:
+      printf(_("Error: Miscellaneous paper error\n"));
+      break;
+    case 0x10:
+      printf(_("Error: Maintenance cartridge overflow\n"));
+      break;
     case 0x11:
       printf(_("Error: Wait return from the tear-off position\n"));
       break;
     case 0x12:
       printf(_("Error: Double feed error\n"));
       break;
+    case 0x1a:
+      printf(_("Error: Ink cartridge lever released\n\n"));
+      break;
     case 0x1c:
       printf(_("Error: Unrecoverable cutter error\n"));
       break;
     case 0x1d:
       printf(_("Error: Recoverable cutter jam\n"));
       break;
+    case 0x22:
+      printf(_("Error: No maintenance cartridge present\n"));
+      break;
+    case 0x25:
+      printf(_("Error: Rear cover open\n"));
+      break;
     case 0x29:
       printf(_("Error: CD Tray Out\n"));
       break;
@@ -1094,6 +1110,15 @@ print_error(int param)
     case 0x2b:
       printf(_("Error: Tray cover open\n"));
       break;
+    case 0x36:
+      printf(_("Error: Maintenance cartridge cover open\n"));
+      break;
+    case 0x37:
+      printf(_("Error: Front cover open\n"));
+      break;
+    case 0x41:
+      printf(_("Error: Maintenance request\n"));
+      break;
     default:
       printf(_("Error: Unknown (%d)\n"), param);
       break;
@@ -1101,6 +1126,44 @@ print_error(int param)
 }
 
 static void
+print_warning(int param, const stp_string_list_t *color_list)
+{
+  if (param >= 0x10 && param < 0x20)
+    {
+      param &= 0xf;
+      if (color_list && param < stp_string_list_count(color_list))
+	printf(_("Warning: %s Ink Low\n"),
+	       gettext(stp_string_list_param(color_list, param)->text));
+      else
+	printf(_("Warning: Channel %d Ink Low\n"), param);
+    }
+  else if (param >= 0x50 && param < 0x60)
+    {
+      param &= 0xf;
+      if (color_list && param < stp_string_list_count(color_list))
+	printf(_("Warning: %s Cleaning Disabled\n"),
+	       gettext(stp_string_list_param(color_list, param)->text));
+      else
+	printf(_("Warning: Channel %d Cleaning \n"), param);
+    }
+  else
+    {
+      switch (param)
+	{
+	case 0x20:
+	  printf(_("Warning: Maintenance cartridge near full\n"));
+	  break;
+	case 0x21:
+	  printf(_("Warning: Maintenance request pending\n"));
+	  break;
+	default:
+	  printf(_("Warning: Unknown (%d)\n"), param);
+	  break;
+	}
+    }
+}
+
+static void
 print_self_printing_state(int param)
 {
   switch (param)
@@ -1224,7 +1287,16 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
   int i = 0;
   int j;
   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(fprintf(stderr, "New format bytes: %d bytes\n", bytes));
+  if (cmd == CMD_STATUS)
+    printf(_("Printer Name: %s\n"),
+	    printer ? stp_printer_get_long_name(printer) : _("Unknown"));
   while (i < bytes)
     {
       unsigned hdr = buf[i];
@@ -1249,7 +1321,7 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 		printf("%18s    %20d\n",
 		       gettext(aux_colors[(int) ind[1]]), ind[2]);
 	      else
-		printf("%8s 0x%2x 0x%2x    %20d\n",
+		printf("%8s 0x%02x 0x%02x    %20d\n",
 		       _("Unknown"), (unsigned char) ind[0],
 		       (unsigned char) ind[1], ind[2]);
 	      ind += param;
@@ -1271,42 +1343,11 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	      print_self_printing_state(param);
 	      break; 
 	    case 0x4:	/* Warning */
-#if 0
-	      /*
-	       * Bits mean different things on different printers
-	       * Need to figure out how to do this...
-	       * Maybe we don't really need to, since we're also
-	       * printing out ink levels
-	       */
-	      for (j = 0; j < total_param_count; i++)
+	      for (j = 0; j < total_param_count; j++)
 		{
 		  param = (unsigned) buf[i + j + 2];
-		  switch (param)
-		    {
-		    case 0x10:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x11:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x12:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x13:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x14:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    case 0x15:
-		      printf(_("Warning: Black Ink Low\n"));
-		      break;
-		    default:
-		      printf(_("Warning: Unknown (%d)\n"), param);
-		      break;
-		    }
+		  print_warning(param, color_list);
 		}
-#endif
 	      break;
 	    case 0x19:	/* Job name */
 	      if (total_param_count > 5)
@@ -1324,6 +1365,7 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	}
       i += total_param_count + 2;
     }
+  stp_parameter_description_destroy(&desc);
   exit(0);
 }
 
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index f90f9d9..0f8937c 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.50 2006/07/08 17:40:22 rlk Exp $
+## $Id: Makefile.am,v 1.51 2008/06/01 14:41:08 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@ if BUILD_FOOMATIC_3
 BUILD_FOOMATIC = 1
 endif
 
-STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+STP_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
 
 LC_C_ENV= LC_ALL=C LANG=C LANGUAGE=C
 
@@ -95,7 +95,7 @@ clean-local:
 
 foomatic-data: foomatic-stamp
 
-foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/xml/xml-stamp
 	-$(RM) -r foomatic-db
 	$(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index d854d6a..a192418 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -50,7 +50,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -75,7 +76,7 @@ printer_options_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_printers_OBJECTS = printers.$(OBJEXT)
 printers_OBJECTS = $(am_printers_OBJECTS)
 printers_DEPENDENCIES = $(GUTENPRINT_LIBS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -127,6 +128,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -147,6 +149,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -179,6 +182,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -199,9 +203,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -228,6 +233,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -300,7 +306,7 @@ GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 DISTDIRS = foomatic-templates-ijs
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS)
 @BUILD_FOOMATIC_3_TRUE@BUILD_FOOMATIC = 1
-STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
+STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
 LC_C_ENV = LC_ALL=C LANG=C LANGUAGE=C
 FOOMATIC_GENERATOR = $(STP_ENV) $(LC_C_ENV) ./foomatic-generator
 printer_options_SOURCES = printer_options.c
@@ -424,8 +430,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -437,8 +443,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -448,13 +454,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -639,7 +644,7 @@ clean-local:
 
 foomatic-data: foomatic-stamp
 
-foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml
+foomatic-stamp: foomatic-generator foomatic-printermap $(noinst_PROGRAMS) mk_printerlist $(top_srcdir)/src/xml/xml-stamp
 	-$(RM) -r foomatic-db
 	$(FOOMATIC_GENERATOR) -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -m $(srcdir)/foomatic-printermap -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index c72679d..57952a8 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -8,7 +8,8 @@ GetOptions("m=s" => \$opt_m,         # Map file
            "t=s" => \$opt_t,         # Template directory
 	   "f=s" => \$opt_f,         # Foomatic version
            "d=s" => \@opt_d,         # which Drivers?
-	   "s"   => \$opt_s);        # Generate simplified data
+	   "s"   => \$opt_s,         # Generate simplified data
+	   "x"   => \$opt_x);	     # Generate printer list
 
 
 # Wherever we put it...
@@ -97,26 +98,28 @@ my $opt_index = 0;
 
 use Data::Dumper;
 
-open PIPE, "./printer_options $simplified_subopt|" or die "Cannot run printer_options: $!\n";
-print STDERR "Loading options from ./printer_options $simplified_subopt...";
-while(<PIPE>) {
-    #print $_;
-    next if m!^#!;
-    eval $_;
-}
-close PIPE or die "Cannot run printer_options: $!\n";
-print STDERR "done.\n";
-
-if ($foomatic3) {
-    open PIPE, "./printer_margins $simplified_subopt|" or die "Cannot run printer_margins: $!\n";
-    print STDERR "Loading margins from ./printer_margins $simplified_subopt...";
+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...";
     while(<PIPE>) {
 	#print $_;
 	next if m!^#!;
 	eval $_;
     }
-    close PIPE or die "Cannot run printer_margins: $!\n";
+    close PIPE or die "Cannot run printer_options: $!\n";
     print STDERR "done.\n";
+
+    if ($foomatic3) {
+	open PIPE, "./printer_margins $simplified_subopt|" or die "Cannot run printer_margins: $!\n";
+	print STDERR "Loading margins from ./printer_margins $simplified_subopt...";
+	while(<PIPE>) {
+	    #print $_;
+	    next if m!^#!;
+	    eval $_;
+	}
+	close PIPE or die "Cannot run printer_margins: $!\n";
+	print STDERR "done.\n";
+    }
 }
 
 open PIPE, "./printers|" or die "Cannot run printers: $!\n";
@@ -138,22 +141,27 @@ $missing_drivers = 0;
 
 %driverlist = ();
 %foolist = ();
+%foomap = ();
 
 open PRINTERS, $mapfile or die "Cannot open mapfile $mapfile: $!\n";
 for (<PRINTERS>) {
     if (m!^#\s*gptofoo\s+([^\s]+)\s+([^\s]+)!) {
-	if ($driverlist{$1}) {
+	my $pname = $1;
+	my $fname = $2;
+	if ($driverlist{$pname}) {
 	    $missing_drivers = 1;
-	    warn "Duplicate driver $1\n";
+	    warn "Duplicate driver $pname\n";
 	}
-	$driverlist{$1} = 1;
-	if ($foolist{$2}) {
+	$driverlist{$pname} = $fname;
+	if ($foolist{$fname}) {
 	    $missing_drivers = 1;
-	    warn "Duplicate Foomatic ID $2\n";
+	    warn "Duplicate Foomatic ID $fname\n";
 	}
-	$foolist{$2} = 1;
-	push (@{$mapstp{$1}}, $2);
-	$mapfoo{$2} = $1;	# do we need?
+	$foolist{$fname} = 1;
+	push (@{$mapstp{$pname}}, $fname);
+	$mapfoo{$fname} = $pname;	# do we need?
+	$fname =~ s,printer/,,;
+	$foomap{$pname} = $fname;
     }
 }
 
@@ -166,7 +174,7 @@ for (keys(%stpdata)) {
 }
 
 for (keys(%mapstp)) {
-    if (!defined($stpdata{$_})) {
+    if (!defined($printer_name{$_})) {
 	$missing_drivers = 1;
 	warn "No gutenprint printer for foomatic ID $_.\n";
     }
@@ -176,6 +184,16 @@ if ($missing_drivers) {
    die "Cannot continue\n";
 }
 
+if ($opt_x) {
+    my (%printer_long_name) = reverse %printer_name;
+    for (sort keys %printer_long_name) {
+	my ($pn) = $printer_long_name{$_};
+	next if $printer_family{$pn} eq "ps" || $printer_family{$pn} eq "raw";
+	printf("%s	%s	%s\n", $_, $pn, $foomap{$pn});
+    }
+    exit;
+}
+
 # OK, now %stpdata is a big honking thing, and %defaults is in there, too.
 
 # Invert, to build %bar{$optionname} = [ choice1, choice2 ];
@@ -1653,10 +1671,9 @@ sub getprintoutmode {
 		(($respersquareinch == $veryhighmaxres) &&
 		 ($symmetry == $veryhighbestsymmetry) &&
 		 (qualityorder($qualstr, $veryhighbestqualstr) > 0))) {
-		unless (($stpprn =~ /^escp2/) && # Epson
-			(($xres > 1440) || # Resolution not higher than
-			 ($yres > 720) ||  # 1440x720
-			 ($qualstr eq "hq2"))) {  # Not "hq2"
+		unless (($xres > 1440) || # Resolution not higher than
+			($yres > 720) ||  # 1440x720
+			($qualstr eq "hq2")) { # Not "hq2"
 		    $veryhighbestsymmetry = $symmetry;
 		    $veryhighmaxres = $respersquareinch;
 		    $veryhighbestqualstr = $qualstr;
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index cbe6867..9778804 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -111,6 +111,7 @@
 #gptofoo bjc-PIXMA-iX5000 printer/Canon-PIXMA-iX5000
 #gptofoo bjc-PIXMA-Pro9500 printer/Canon-PIXMA-Pro9500
 #gptofoo bjc-MULTIPASS-MP150 printer/Canon-MULTIPASS-MP150
+#gptofoo bjc-MULTIPASS-MP160 printer/Canon-MULTIPASS-MP160
 #gptofoo bjc-MULTIPASS-MP170 printer/Canon-MULTIPASS-MP170
 #gptofoo bjc-MULTIPASS-MP180 printer/Canon-MULTIPASS-MP180
 #gptofoo bjc-MULTIPASS-MP500 printer/Canon-MULTIPASS-MP500
@@ -146,6 +147,12 @@
 #gptofoo epson-acl_c8500ps printer/Epson-AcuLaser_C8500PS
 #gptofoo epson-acl_c8600 printer/Epson-AcuLaser_C8600
 #gptofoo epson-acl_c8600ps printer/Epson-AcuLaser_C8600PS
+#gptofoo escp2-artisan700 printer/Epson-Artisan_700
+#gptofoo escp2-artisan800 printer/Epson-Artisan_800
+#gptofoo escp2-b300 printer/Epson-B300
+#gptofoo escp2-b308 printer/Epson-B308
+#gptofoo escp2-b500dn printer/Epson-B500DN
+#gptofoo escp2-b508dn printer/Epson-B508DN
 #gptofoo escp2-cl700 printer/Epson-CL_700
 #gptofoo escp2-cl750 printer/Epson-CL_750
 #gptofoo escp2-cl760 printer/Epson-CL_760
@@ -231,7 +238,10 @@
 #gptofoo escp2-px7000 printer/Epson-PX_7000
 #gptofoo escp2-px9000 printer/Epson-PX_9000
 #gptofoo escp2-pxa650 printer/Epson-PX_A650
+#gptofoo escp2-pxb300 printer/Epson-Offirio-PX_B300
+#gptofoo escp2-pxb500 printer/Epson-Offirio-PX_B500
 #gptofoo escp2-pxg5000 printer/Epson-PX_G5000
+#gptofoo escp2-pxg5300 printer/Epson-PX_G5300
 #gptofoo escp2-pxg900 printer/Epson-PX_G900
 #gptofoo escp2-pxg920 printer/Epson-PX_G920
 #gptofoo escp2-pxv500 printer/Epson-PX_V500
@@ -247,6 +257,7 @@
 #gptofoo escp2-picmate100 printer/Epson-PictureMate_100
 #gptofoo escp2-picmate200 printer/Epson-PictureMate_200
 #gptofoo escp2-picmate210 printer/Epson-PictureMate_210
+#gptofoo escp2-picmate215 printer/Epson-PictureMate_215
 #gptofoo escp2-picmate240 printer/Epson-PictureMate_240
 #gptofoo escp2-picmate250 printer/Epson-PictureMate_250
 #gptofoo escp2-picmate260 printer/Epson-PictureMate_260
@@ -321,6 +332,7 @@
 #gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
 #gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
 #gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
+#gptofoo escp2-cx5500 printer/Epson-Stylus_CX5500
 #gptofoo escp2-cx5600 printer/Epson-Stylus_CX5600
 #gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
 #gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
@@ -335,7 +347,10 @@
 #gptofoo escp2-cx7800 printer/Epson-Stylus_CX7800
 #gptofoo escp2-cx8300 printer/Epson-Stylus_CX8300
 #gptofoo escp2-cx8400 printer/Epson-Stylus_CX8400
+#gptofoo escp2-cx9300f printer/Epson-Stylus_CX9300F
 #gptofoo escp2-cx9400 printer/Epson-Stylus_CX9400
+#gptofoo escp2-cx9400f printer/Epson-Stylus_CX9400F
+#gptofoo escp2-cx9475f printer/Epson-Stylus_CX9475F
 #gptofoo escp2 printer/Epson-Stylus_Color
 #gptofoo escp2-1160 printer/Epson-Stylus_Color_1160
 #gptofoo escp2-1500 printer/Epson-Stylus_Color_1500
@@ -383,6 +398,11 @@
 #gptofoo escp2-dx7450 printer/Epson-Stylus_DX7450
 #gptofoo escp2-dx8400 printer/Epson-Stylus_DX8400
 #gptofoo escp2-dx8450 printer/Epson-Stylus_DX8450
+#gptofoo escp2-dx9400f printer/Epson-Stylus_DX9400F
+#gptofoo escp2-nx100 printer/Epson-Stylus_NX100
+#gptofoo escp2-nx200 printer/Epson-Stylus_NX200
+#gptofoo escp2-nx300 printer/Epson-Stylus_NX300
+#gptofoo escp2-nx400 printer/Epson-Stylus_NX400
 #gptofoo escp2-photo printer/Epson-Stylus_Photo
 #gptofoo escp2-1200 printer/Epson-Stylus_Photo_1200
 #gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270
@@ -417,6 +437,7 @@
 #gptofoo escp2-ex printer/Epson-Stylus_Photo_EX
 #gptofoo escp2-ex3 printer/Epson-Stylus_Photo_EX3
 #gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800
+#gptofoo escp2-r1900 printer/Epson-Stylus_Photo_R1900
 #gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
 #gptofoo escp2-r200 printer/Epson-Stylus_Photo_R200
 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210
@@ -429,6 +450,7 @@
 #gptofoo escp2-r270 printer/Epson-Stylus_Photo_R270
 #gptofoo escp2-r280 printer/Epson-Stylus_Photo_R280
 #gptofoo escp2-r285 printer/Epson-Stylus_Photo_R285
+#gptofoo escp2-r290 printer/Epson-Stylus_Photo_R290
 #gptofoo escp2-r300 printer/Epson-Stylus_Photo_R300
 #gptofoo escp2-r310 printer/Epson-Stylus_Photo_R310
 #gptofoo escp2-r320 printer/Epson-Stylus_Photo_R320
@@ -450,24 +472,67 @@
 #gptofoo escp2-rx590 printer/Epson-Stylus_Photo_RX590
 #gptofoo escp2-rx595 printer/Epson-Stylus_Photo_RX595
 #gptofoo escp2-rx600 printer/Epson-Stylus_Photo_RX600
+#gptofoo escp2-rx610 printer/Epson-Stylus_Photo_RX610
 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620
 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630
 #gptofoo escp2-rx640 printer/Epson-Stylus_Photo_RX640
 #gptofoo escp2-rx680 printer/Epson-Stylus_Photo_RX680
 #gptofoo escp2-rx685 printer/Epson-Stylus_Photo_RX685
+#gptofoo escp2-rx690 printer/Epson-Stylus_Photo_RX690
 #gptofoo escp2-rx700 printer/Epson-Stylus_Photo_RX700
-#gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
 #gptofoo escp2-5000 printer/Epson-Stylus_Pro_5000
 #gptofoo escp2-5500 printer/Epson-Stylus_Pro_5500
 #gptofoo escp2-7000 printer/Epson-Stylus_Pro_7000
 #gptofoo escp2-7500 printer/Epson-Stylus_Pro_7500
 #gptofoo escp2-7600 printer/Epson-Stylus_Pro_7600
+#gptofoo escp2-7800 printer/Epson-Stylus_Pro_7800
+#gptofoo escp2-7880 printer/Epson-Stylus_Pro_7880
 #gptofoo escp2-9000 printer/Epson-Stylus_Pro_9000
 #gptofoo escp2-9500 printer/Epson-Stylus_Pro_9500
 #gptofoo escp2-9600 printer/Epson-Stylus_Pro_9600
+#gptofoo escp2-9800 printer/Epson-Stylus_Pro_9800
+#gptofoo escp2-9880 printer/Epson-Stylus_Pro_9880
+#gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
+#gptofoo escp2-11880 printer/Epson-Stylus_Pro_11880
 #gptofoo escp2-pro-xl printer/Epson-Stylus_Pro_XL
 #gptofoo escp2-scan2000 printer/Epson-Stylus_Scan_2000
 #gptofoo escp2-scan2500 printer/Epson-Stylus_Scan_2500
+#gptofoo escp2-px101 printer/Epson-PX_101
+#gptofoo escp2-px201 printer/Epson-PX_201
+#gptofoo escp2-px601f printer/Epson-PX_601F
+#gptofoo escp2-of-b30 printer/Epson-Stylus_Office_B30
+#gptofoo escp2-of-b33 printer/Epson-Stylus_Office_B33
+#gptofoo escp2-of-b40w printer/Epson-Stylus_Office_B40W
+#gptofoo escp2-of-t30 printer/Epson-Stylus_Office_T30
+#gptofoo escp2-of-t33 printer/Epson-Stylus_Office_T33
+#gptofoo escp2-of-t40w printer/Epson-Stylus_Office_T40W
+#gptofoo escp2-of-bx300f printer/Epson-Stylus_Office_BX300F
+#gptofoo escp2-of-bx600fw printer/Epson-Stylus_Office_BX600FW
+#gptofoo escp2-of-sx600fw printer/Epson-Stylus_Office_SX600FW
+#gptofoo escp2-of-tx600fw printer/Epson-Stylus_Office_TX600FW
+#gptofoo escp2-of-tx300f printer/Epson-Stylus_Office_TX300F
+#gptofoo escp2-meof70 printer/Epson-ME_Office_70
+#gptofoo escp2-meof80w printer/Epson-ME_Office_80W
+#gptofoo escp2-meof700fw printer/Epson-ME_Office_700FW
+#gptofoo escp2-wf30 printer/Epson-WorkForce_30
+#gptofoo escp2-wf40 printer/Epson-WorkForce_40
+#gptofoo escp2-wf500 printer/Epson-WorkForce_500
+#gptofoo escp2-wf600 printer/Epson-WorkForce_600
+#gptofoo escp2-px700fw printer/Epson-Stylus_PX700FW
+#gptofoo escp2-px800fw printer/Epson-Stylus_PX800FW
+#gptofoo escp2-s20 printer/Epson-Stylus_S20
+#gptofoo escp2-sx100 printer/Epson-Stylus_SX100
+#gptofoo escp2-sx105 printer/Epson-Stylus_SX105
+#gptofoo escp2-sx200 printer/Epson-Stylus_SX200
+#gptofoo escp2-sx205 printer/Epson-Stylus_SX205
+#gptofoo escp2-sx400 printer/Epson-Stylus_SX400
+#gptofoo escp2-sx405 printer/Epson-Stylus_SX405
+#gptofoo escp2-t20 printer/Epson-Stylus_T20
+#gptofoo escp2-tx100 printer/Epson-Stylus_TX100
+#gptofoo escp2-tx200 printer/Epson-Stylus_TX200
+#gptofoo escp2-tx400 printer/Epson-Stylus_TX400
+#gptofoo escp2-tx700w printer/Epson-Stylus_Photo_TX700W
+#gptofoo escp2-tx800w printer/Epson-Stylus_Photo_TX800W
 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550
 #gptofoo fujifilm-nx500 printer/Fujifilm-FinePix-NX-500
@@ -810,21 +875,21 @@
 #gptofoo nec-ssc_660i printer/NEC-SuperScript_660i
 #gptofoo nec-ssc_860 printer/NEC-SuperScript_860
 #gptofoo nec-ssc_870 printer/NEC-SuperScript_870
-#gptofoo okidata-ol400 printer/Okidata-OL400
-#gptofoo okidata-ol400e printer/Okidata-OL400e
-#gptofoo okidata-ol400ex printer/Okidata-OL400ex
-#gptofoo okidata-ol410e printer/Okidata-OL410e
-#gptofoo okidata-ol600e printer/Okidata-OL600e
-#gptofoo okidata-ol610e_s printer/Okidata-OL610e_S
-#gptofoo okidata-ol800 printer/Okidata-OL800
-#gptofoo okidata-ol810ex printer/Okidata-OL810ex
-#gptofoo okidata-okp_10e printer/Okidata-Okipage_10e
-#gptofoo okidata-okp_10ex printer/Okidata-Okipage_10ex
-#gptofoo okidata-okp_14ex printer/Okidata-Okipage_14ex
-#gptofoo okidata-okp_6e printer/Okidata-Okipage_6e
-#gptofoo okidata-okp_6ex printer/Okidata-Okipage_6ex
-#gptofoo okidata-okp_8p printer/Okidata-Okipage_8p
-#gptofoo okidata-super_6e printer/Okidata-Super_6e
+#gptofoo okidata-ol400 printer/Oki-OL400
+#gptofoo okidata-ol400e printer/Oki-OL400e
+#gptofoo okidata-ol400ex printer/Oki-OL400ex
+#gptofoo okidata-ol410e printer/Oki-OL410e
+#gptofoo okidata-ol600e printer/Oki-OL600e
+#gptofoo okidata-ol610e_s printer/Oki-OL610e_S
+#gptofoo okidata-ol800 printer/Oki-OL800
+#gptofoo okidata-ol810ex printer/Oki-OL810ex
+#gptofoo okidata-okp_10e printer/Oki-Okipage_10e
+#gptofoo okidata-okp_10ex printer/Oki-Okipage_10ex
+#gptofoo okidata-okp_14ex printer/Oki-Okipage_14ex
+#gptofoo okidata-okp_6e printer/Oki-Okipage_6e
+#gptofoo okidata-okp_6ex printer/Oki-Okipage_6ex
+#gptofoo okidata-okp_8p printer/Oki-Okipage_8p
+#gptofoo okidata-super_6e printer/Oki-Super_6e
 #gptofoo olivetti-jp350s printer/Olivetti-JP350S
 #gptofoo olivetti-pg_306 printer/Olivetti-PG_306
 #gptofoo olympus-p10 printer/Olympus-P-10
@@ -880,3 +945,466 @@
 #gptofoo xerox-dp_p8e printer/Xerox-DocuPrint_P8e
 #gptofoo xerox-dc_400 printer/Xerox-Document_Centre_400
 #gptofoo xerox-wc_m118 printer/Xerox-Work_Centre_M118
+#gptofoo brother-dcp-8045d printer/Brother-DCP-8045D
+#gptofoo brother-hl-1430 printer/Brother-HL-1430
+#gptofoo brother-hl-1450 printer/Brother-HL-1450
+#gptofoo brother-hl-1470n printer/Brother-HL-1470N
+#gptofoo brother-hl-1650 printer/Brother-HL-1650
+#gptofoo brother-hl-1670n printer/Brother-HL-1670N
+#gptofoo brother-hl-1850 printer/Brother-HL-1850
+#gptofoo brother-hl-1870n printer/Brother-HL-1870N
+#gptofoo brother-hl-2460 printer/Brother-HL-2460
+#gptofoo brother-hl-2460n printer/Brother-HL-2460N
+#gptofoo brother-hl-5030 printer/Brother-HL-5030
+#gptofoo brother-hl-5040 printer/Brother-HL-5040
+#gptofoo brother-hl-5050 printer/Brother-HL-5050
+#gptofoo brother-hl-5070n printer/Brother-HL-5070N
+#gptofoo brother-hl-5140 printer/Brother-HL-5140
+#gptofoo brother-hl-5150d printer/Brother-HL-5150D
+#gptofoo brother-hl-5170dn printer/Brother-HL-5170DN
+#gptofoo brother-hl-7050 printer/Brother-HL-7050
+#gptofoo brother-hl-7050n printer/Brother-HL-7050N
+#gptofoo epson-epl-n2050 printer/Epson-EPL-N2050
+#gptofoo epson-epl-n2050ps printer/Epson-EPL-N2050PS
+#gptofoo epson-epl-n2050psplus printer/Epson-EPL-N2050PS+
+#gptofoo epson-epl-n2050plus printer/Epson-EPL-N2050+
+#gptofoo epson-epl-n2120 printer/Epson-EPL-N2120
+#gptofoo epson-epl-n2500 printer/Epson-EPL-N2500
+#gptofoo epson-epl-n2500ps printer/Epson-EPL-N2500PS
+#gptofoo epson-epl-n2750 printer/Epson-EPL-N2750
+#gptofoo epson-epl-n2750ps printer/Epson-EPL-N2750PS
+#gptofoo gestetner-10512 printer/Gestetner-10512
+#gptofoo gestetner-2212 printer/Gestetner-2212
+#gptofoo gestetner-2712 printer/Gestetner-2712
+#gptofoo gestetner-3212 printer/Gestetner-3212
+#gptofoo gestetner-3502 printer/Gestetner-3502
+#gptofoo gestetner-3532 printer/Gestetner-3532
+#gptofoo gestetner-4235g printer/Gestetner-4235g
+#gptofoo gestetner-4502 printer/Gestetner-4502
+#gptofoo gestetner-4532 printer/Gestetner-4532
+#gptofoo gestetner-4245g printer/Gestetner-4245g
+#gptofoo gestetner-6002 printer/Gestetner-6002
+#gptofoo gestetner-7502 printer/Gestetner-7502
+#gptofoo gestetner-9002 printer/Gestetner-9002
+#gptofoo gestetner-dsm415 printer/Gestetner-DSm415
+#gptofoo gestetner-dsm615 printer/Gestetner-DSm615
+#gptofoo gestetner-dsm616 printer/Gestetner-DSm616
+#gptofoo gestetner-dsm618 printer/Gestetner-DSm618
+#gptofoo gestetner-dsm618d printer/Gestetner-DSm618d
+#gptofoo gestetner-dsm620 printer/Gestetner-DSm620
+#gptofoo gestetner-dsm620d printer/Gestetner-DSm620d
+#gptofoo gestetner-dsm622 printer/Gestetner-DSm622
+#gptofoo gestetner-dsm627 printer/Gestetner-DSm627
+#gptofoo gestetner-dsm635 printer/Gestetner-DSm635
+#gptofoo gestetner-dsm635g printer/Gestetner-DSm635G
+#gptofoo gestetner-dsm645 printer/Gestetner-DSm645
+#gptofoo gestetner-ds645g printer/Gestetner-DS645G
+#gptofoo gestetner-dsm651 printer/Gestetner-DSm651
+#gptofoo gestetner-dsm660 printer/Gestetner-DSm660
+#gptofoo gestetner-dsm675 printer/Gestetner-DSm675
+#gptofoo gestetner-dsm725 printer/Gestetner-DSm725
+#gptofoo gestetner-dsm730 printer/Gestetner-DSm730
+#gptofoo gestetner-dsm735 printer/Gestetner-DSm735
+#gptofoo gestetner-dsm735g printer/Gestetner-DSm735G
+#gptofoo gestetner-dsm745 printer/Gestetner-DSm745
+#gptofoo gestetner-dsm745g printer/Gestetner-DSm745G
+#gptofoo gestetner-mp1100 printer/Gestetner-MP1100
+#gptofoo gestetner-dsm7110 printer/Gestetner-DSm7110
+#gptofoo gestetner-mp1350 printer/Gestetner-MP1350
+#gptofoo gestetner-dsm7135 printer/Gestetner-DSm7135
+#gptofoo gestetner-mp1600 printer/Gestetner-MP1600
+#gptofoo gestetner-dsm716 printer/Gestetner-DSm716
+#gptofoo gestetner-mp2000 printer/Gestetner-MP2000
+#gptofoo gestetner-dsm721d printer/Gestetner-DSm721d
+#gptofoo gestetner-mp2500 printer/Gestetner-MP2500
+#gptofoo gestetner-dsm625 printer/Gestetner-DSm625
+#gptofoo gestetner-mp3500 printer/Gestetner-MP3500
+#gptofoo gestetner-dsm735e printer/Gestetner-DSm735e
+#gptofoo gestetner-mp4500 printer/Gestetner-MP4500
+#gptofoo gestetner-dsm745e printer/Gestetner-DSm745e
+#gptofoo gestetner-mp5500 printer/Gestetner-MP5500
+#gptofoo gestetner-dsm755 printer/Gestetner-DSm755
+#gptofoo gestetner-mp6500 printer/Gestetner-MP6500
+#gptofoo gestetner-dsm765 printer/Gestetner-DSm765
+#gptofoo gestetner-mp7500 printer/Gestetner-MP7500
+#gptofoo gestetner-dsm775 printer/Gestetner-DSm775
+#gptofoo gestetner-mp9000 printer/Gestetner-MP9000
+#gptofoo gestetner-dsm790 printer/Gestetner-DSm790
+#gptofoo gestetner-mp_161 printer/Gestetner-MP_161
+#gptofoo gestetner-dsm416 printer/Gestetner-DSm416
+#gptofoo gestetner-mp_2510 printer/Gestetner-MP_2510
+#gptofoo gestetner-dsm725e printer/Gestetner-DSm725e
+#gptofoo gestetner-mp_2550 printer/Gestetner-MP_2550
+#gptofoo gestetner-mp_2550b printer/Gestetner-MP_2550B
+#gptofoo gestetner-mp_3010 printer/Gestetner-MP_3010
+#gptofoo gestetner-dsm730e printer/Gestetner-DSm730e
+#gptofoo gestetner-mp_3350 printer/Gestetner-MP_3350
+#gptofoo gestetner-mp_3350b printer/Gestetner-MP_3350B
+#gptofoo gestetner-mp_4000 printer/Gestetner-MP_4000
+#gptofoo gestetner-mp_4000b printer/Gestetner-MP_4000B
+#gptofoo gestetner-mp_5000 printer/Gestetner-MP_5000
+#gptofoo gestetner-mp_5000b printer/Gestetner-MP_5000B
+#gptofoo infotec-4353_mf printer/Infotec-4353_MF
+#gptofoo infotec-4452_mf printer/Infotec-4452_MF
+#gptofoo infotec-is2022 printer/Infotec-IS2022
+#gptofoo infotec-is2027 printer/Infotec-IS2027
+#gptofoo infotec-is2032 printer/Infotec-IS2032
+#gptofoo infotec-is2035 printer/Infotec-IS2035
+#gptofoo infotec-is2045 printer/Infotec-IS2045
+#gptofoo infotec-is2090 printer/Infotec-IS2090
+#gptofoo infotec-is2105 printer/Infotec-IS2105
+#gptofoo infotec-is_2015 printer/Infotec-IS_2015
+#gptofoo infotec-is_2018 printer/Infotec-IS_2018
+#gptofoo infotec-is_2018d printer/Infotec-IS_2018D
+#gptofoo infotec-is_2060 printer/Infotec-IS_2060
+#gptofoo infotec-is_2075 printer/Infotec-IS_2075
+#gptofoo infotec-is_2122 printer/Infotec-IS_2122
+#gptofoo infotec-is_2127 printer/Infotec-IS_2127
+#gptofoo infotec-is_2132 printer/Infotec-IS_2132
+#gptofoo infotec-is_2135 printer/Infotec-IS_2135
+#gptofoo infotec-is_2145 printer/Infotec-IS_2145
+#gptofoo infotec-is_2151 printer/Infotec-IS_2151
+#gptofoo infotec-is_2160 printer/Infotec-IS_2160
+#gptofoo infotec-is_2175 printer/Infotec-IS_2175
+#gptofoo infotec-is_2215 printer/Infotec-IS_2215
+#gptofoo infotec-is_2216 printer/Infotec-IS_2216
+#gptofoo infotec-is_2220 printer/Infotec-IS_2220
+#gptofoo infotec-is_2220d printer/Infotec-IS_2220D
+#gptofoo infotec-is_2225 printer/Infotec-IS_2225
+#gptofoo infotec-is_2230 printer/Infotec-IS_2230
+#gptofoo infotec-is_2235 printer/Infotec-IS_2235
+#gptofoo infotec-is_2245 printer/Infotec-IS_2245
+#gptofoo infotec-is_2255 printer/Infotec-IS_2255
+#gptofoo infotec-is_2265 printer/Infotec-IS_2265
+#gptofoo infotec-is_2275 printer/Infotec-IS_2275
+#gptofoo infotec-is_2316 printer/Infotec-IS_2316
+#gptofoo infotec-is_2320 printer/Infotec-IS_2320
+#gptofoo infotec-is_2325 printer/Infotec-IS_2325
+#gptofoo infotec-is_2416 printer/Infotec-IS_2416
+#gptofoo infotec-is_2425 printer/Infotec-IS_2425
+#gptofoo infotec-is_2430 printer/Infotec-IS_2430
+#gptofoo infotec-is_2435 printer/Infotec-IS_2435
+#gptofoo infotec-is_2445 printer/Infotec-IS_2445
+#gptofoo infotec-is_3090 printer/Infotec-IS_3090
+#gptofoo infotec-is_3110 printer/Infotec-IS_3110
+#gptofoo infotec-is_3135 printer/Infotec-IS_3135
+#gptofoo infotec-mp_2550 printer/Infotec-MP_2550
+#gptofoo infotec-mp_2550b printer/Infotec-MP_2550B
+#gptofoo infotec-mp_3350 printer/Infotec-MP_3350
+#gptofoo infotec-mp_3350b printer/Infotec-MP_3350B
+#gptofoo infotec-mp_4000 printer/Infotec-MP_4000
+#gptofoo infotec-mp_4000b printer/Infotec-MP_4000B
+#gptofoo infotec-mp_5000 printer/Infotec-MP_5000
+#gptofoo infotec-mp_5000b printer/Infotec-MP_5000B
+#gptofoo lanier-5622 printer/Lanier-5622
+#gptofoo lanier-5627 printer/Lanier-5627
+#gptofoo lanier-5632 printer/Lanier-5632
+#gptofoo lanier-5635 printer/Lanier-5635
+#gptofoo lanier-5645 printer/Lanier-5645
+#gptofoo lanier-ld0105 printer/Lanier-LD0105
+#gptofoo lanier-ld015 printer/Lanier-LD015
+#gptofoo lanier-ld035 printer/Lanier-LD035
+#gptofoo lanier-ld045 printer/Lanier-LD045
+#gptofoo lanier-ld060 printer/Lanier-LD060
+#gptofoo lanier-ld075 printer/Lanier-LD075
+#gptofoo lanier-ld090 printer/Lanier-LD090
+#gptofoo lanier-ld115 printer/Lanier-LD115
+#gptofoo lanier-ld116 printer/Lanier-LD116
+#gptofoo lanier-ld118 printer/Lanier-LD118
+#gptofoo lanier-ld118d printer/Lanier-LD118d
+#gptofoo lanier-ld120 printer/Lanier-LD120
+#gptofoo lanier-ld120d printer/Lanier-LD120d
+#gptofoo lanier-ld122 printer/Lanier-LD122
+#gptofoo lanier-ld127 printer/Lanier-LD127
+#gptofoo lanier-ld132 printer/Lanier-LD132
+#gptofoo lanier-ld135 printer/Lanier-LD135
+#gptofoo lanier-ld145 printer/Lanier-LD145
+#gptofoo lanier-ld151 printer/Lanier-LD151
+#gptofoo lanier-ld160 printer/Lanier-LD160
+#gptofoo lanier-ld175 printer/Lanier-LD175
+#gptofoo lanier-ld225 printer/Lanier-LD225
+#gptofoo lanier-ld230 printer/Lanier-LD230
+#gptofoo lanier-ld235 printer/Lanier-LD235
+#gptofoo lanier-ld245 printer/Lanier-LD245
+#gptofoo lanier-mp_2500 printer/Lanier-MP_2500
+#gptofoo lanier-ld125 printer/Lanier-LD125
+#gptofoo lanier-mp_1100 printer/Lanier-MP_1100
+#gptofoo lanier-ld1100 printer/Lanier-LD1100
+#gptofoo lanier-mp_1350 printer/Lanier-MP_1350
+#gptofoo lanier-ld1135 printer/Lanier-LD1135
+#gptofoo lanier-mp_1600 printer/Lanier-MP_1600
+#gptofoo lanier-ld316 printer/Lanier-LD316
+#gptofoo lanier-mp_161 printer/Lanier-MP_161
+#gptofoo lanier-ld016 printer/Lanier-LD016
+#gptofoo lanier-mp_2000 printer/Lanier-MP_2000
+#gptofoo lanier-ld320d printer/Lanier-LD320d
+#gptofoo lanier-mp_2510 printer/Lanier-MP_2510
+#gptofoo lanier-ld325 printer/Lanier-LD325
+#gptofoo lanier-mp_2550b printer/Lanier-MP_2550B
+#gptofoo lanier-ld425b printer/Lanier-LD425B
+#gptofoo lanier-mp_2550 printer/Lanier-MP_2550
+#gptofoo lanier-ld425 printer/Lanier-LD425
+#gptofoo lanier-mp_3010 printer/Lanier-MP_3010
+#gptofoo lanier-ld330 printer/Lanier-LD330
+#gptofoo lanier-mp_3350b printer/Lanier-MP_3350B
+#gptofoo lanier-ld433b printer/Lanier-LD433B
+#gptofoo lanier-mp_3350 printer/Lanier-MP_3350
+#gptofoo lanier-ld433 printer/Lanier-LD433
+#gptofoo lanier-mp_3500 printer/Lanier-MP_3500
+#gptofoo lanier-ld335 printer/Lanier-LD335
+#gptofoo lanier-mp_4000b printer/Lanier-MP_4000B
+#gptofoo lanier-ld040b printer/Lanier-LD040B
+#gptofoo lanier-mp_4000 printer/Lanier-MP_4000
+#gptofoo lanier-ld040 printer/Lanier-LD040
+#gptofoo lanier-mp_4500 printer/Lanier-MP_4500
+#gptofoo lanier-ld345 printer/Lanier-LD345
+#gptofoo lanier-mp_5000b printer/Lanier-MP_5000B
+#gptofoo lanier-ld050b printer/Lanier-LD050B
+#gptofoo lanier-mp_5000 printer/Lanier-MP_5000
+#gptofoo lanier-ld050 printer/Lanier-LD050
+#gptofoo lanier-mp_5500 printer/Lanier-MP_5500
+#gptofoo lanier-ld255 printer/Lanier-LD255
+#gptofoo lanier-mp_6500 printer/Lanier-MP_6500
+#gptofoo lanier-ld265 printer/Lanier-LD265
+#gptofoo lanier-mp_7500 printer/Lanier-MP_7500
+#gptofoo lanier-ld275 printer/Lanier-LD275
+#gptofoo lanier-mp_9000 printer/Lanier-MP_9000
+#gptofoo lanier-ld190 printer/Lanier-LD190
+#gptofoo lexmark-optra_e321 printer/Lexmark-Optra_E321
+#gptofoo lexmark-optra_e323 printer/Lexmark-Optra_E323
+#gptofoo nrg-10515 printer/NRG-10515
+#gptofoo nrg-10518 printer/NRG-10518
+#gptofoo nrg-10512 printer/NRG-10512
+#gptofoo nrg-2205 printer/NRG-2205
+#gptofoo nrg-2238 printer/NRG-2238
+#gptofoo nrg-2212 printer/NRG-2212
+#gptofoo nrg-2705 printer/NRG-2705
+#gptofoo nrg-2738 printer/NRG-2738
+#gptofoo nrg-2712 printer/NRG-2712
+#gptofoo nrg-3205 printer/NRG-3205
+#gptofoo nrg-3238 printer/NRG-3238
+#gptofoo nrg-3212 printer/NRG-3212
+#gptofoo nrg-3525 printer/NRG-3525
+#gptofoo nrg-3508 printer/NRG-3508
+#gptofoo nrg-3502 printer/NRG-3502
+#gptofoo nrg-3545 printer/NRG-3545
+#gptofoo nrg-3518 printer/NRG-3518
+#gptofoo nrg-3532 printer/NRG-3532
+#gptofoo nrg-4525 printer/NRG-4525
+#gptofoo nrg-4508 printer/NRG-4508
+#gptofoo nrg-4502 printer/NRG-4502
+#gptofoo nrg-4545 printer/NRG-4545
+#gptofoo nrg-4518 printer/NRG-4518
+#gptofoo nrg-4532 printer/NRG-4532
+#gptofoo nrg-6002 printer/NRG-6002
+#gptofoo nrg-6005 printer/NRG-6005
+#gptofoo nrg-6008 printer/NRG-6008
+#gptofoo nrg-7502 printer/NRG-7502
+#gptofoo nrg-7505 printer/NRG-7505
+#gptofoo nrg-7508 printer/NRG-7508
+#gptofoo nrg-9005 printer/NRG-9005
+#gptofoo nrg-9008 printer/NRG-9008
+#gptofoo nrg-9002 printer/NRG-9002
+#gptofoo nrg-dsm415 printer/NRG-DSm415
+#gptofoo nrg-dsm615 printer/NRG-DSm615
+#gptofoo nrg-dsm616 printer/NRG-DSm616
+#gptofoo nrg-dsm618 printer/NRG-DSm618
+#gptofoo nrg-dsm618d printer/NRG-DSm618d
+#gptofoo nrg-dsm620 printer/NRG-DSm620
+#gptofoo nrg-dsm620d printer/NRG-DSm620d
+#gptofoo nrg-dsm622 printer/NRG-DSm622
+#gptofoo nrg-dsm627 printer/NRG-DSm627
+#gptofoo nrg-dsm632 printer/NRG-DSm632
+#gptofoo nrg-dsm635 printer/NRG-DSm635
+#gptofoo nrg-dsm645 printer/NRG-DSm645
+#gptofoo nrg-dsm651 printer/NRG-DSm651
+#gptofoo nrg-dsm660 printer/NRG-DSm660
+#gptofoo nrg-dsm675 printer/NRG-DSm675
+#gptofoo nrg-dsm725 printer/NRG-DSm725
+#gptofoo nrg-dsm730 printer/NRG-DSm730
+#gptofoo nrg-dsm735 printer/NRG-DSm735
+#gptofoo nrg-dsm745 printer/NRG-DSm745
+#gptofoo nrg-mp_1100 printer/NRG-MP_1100
+#gptofoo nrg-mp_1350 printer/NRG-MP_1350
+#gptofoo nrg-mp_1600 printer/NRG-MP_1600
+#gptofoo nrg-mp_161 printer/NRG-MP_161
+#gptofoo nrg-mp_2000 printer/NRG-MP_2000
+#gptofoo nrg-mp_2500 printer/NRG-MP_2500
+#gptofoo nrg-mp_2510 printer/NRG-MP_2510
+#gptofoo nrg-mp_2550 printer/NRG-MP_2550
+#gptofoo nrg-mp_2550b printer/NRG-MP_2550B
+#gptofoo nrg-mp_3010 printer/NRG-MP_3010
+#gptofoo nrg-mp_3350 printer/NRG-MP_3350
+#gptofoo nrg-mp_3350b printer/NRG-MP_3350B
+#gptofoo nrg-mp_3500 printer/NRG-MP_3500
+#gptofoo nrg-mp_4000 printer/NRG-MP_4000
+#gptofoo nrg-mp_4000b printer/NRG-MP_4000B
+#gptofoo nrg-mp_4500 printer/NRG-MP_4500
+#gptofoo nrg-mp_5000 printer/NRG-MP_5000
+#gptofoo nrg-mp_5000b printer/NRG-MP_5000B
+#gptofoo nrg-mp_5500 printer/NRG-MP_5500
+#gptofoo nrg-mp_6500 printer/NRG-MP_6500
+#gptofoo nrg-mp_7500 printer/NRG-MP_7500
+#gptofoo nrg-mp_9000 printer/NRG-MP_9000
+#gptofoo ricoh-afc_1022 printer/Ricoh-Aficio_1022
+#gptofoo ricoh-afc_1027 printer/Ricoh-Aficio_1027
+#gptofoo ricoh-afc_1032 printer/Ricoh-Aficio_1032
+#gptofoo ricoh-afc_1035 printer/Ricoh-Aficio_1035
+#gptofoo ricoh-afc_1045 printer/Ricoh-Aficio_1045
+#gptofoo ricoh-afc_1060 printer/Ricoh-Aficio_1060
+#gptofoo ricoh-afc_1075 printer/Ricoh-Aficio_1075
+#gptofoo ricoh-afc_1515 printer/Ricoh-Aficio_1515
+#gptofoo ricoh-afc_2015 printer/Ricoh-Aficio_2015
+#gptofoo ricoh-afc_2016 printer/Ricoh-Aficio_2016
+#gptofoo ricoh-afc_2018 printer/Ricoh-Aficio_2018
+#gptofoo ricoh-afc_2018d printer/Ricoh-Aficio_2018D
+#gptofoo ricoh-afc_2020 printer/Ricoh-Aficio_2020
+#gptofoo ricoh-afc_2020d printer/Ricoh-Aficio_2020D
+#gptofoo ricoh-afc_2022 printer/Ricoh-Aficio_2022
+#gptofoo ricoh-afc_2027 printer/Ricoh-Aficio_2027
+#gptofoo ricoh-afc_2032 printer/Ricoh-Aficio_2032
+#gptofoo ricoh-afc_2035 printer/Ricoh-Aficio_2035
+#gptofoo ricoh-afc_2035e printer/Ricoh-Aficio_2035e
+#gptofoo ricoh-afc_2045 printer/Ricoh-Aficio_2045
+#gptofoo ricoh-afc_2045e printer/Ricoh-Aficio_2045e
+#gptofoo ricoh-afc_2051 printer/Ricoh-Aficio_2051
+#gptofoo ricoh-afc_2060 printer/Ricoh-Aficio_2060
+#gptofoo ricoh-afc_2075 printer/Ricoh-Aficio_2075
+#gptofoo ricoh-afc_2090 printer/Ricoh-Aficio_2090
+#gptofoo ricoh-afc_2105 printer/Ricoh-Aficio_2105
+#gptofoo ricoh-afc_3025 printer/Ricoh-Aficio_3025
+#gptofoo ricoh-afc_3030 printer/Ricoh-Aficio_3030
+#gptofoo ricoh-afc_3035 printer/Ricoh-Aficio_3035
+#gptofoo ricoh-afc_3045 printer/Ricoh-Aficio_3045
+#gptofoo ricoh-afc_mp_1100 printer/Ricoh-Aficio_MP_1100
+#gptofoo ricoh-afc_mp_1350 printer/Ricoh-Aficio_MP_1350
+#gptofoo ricoh-afc_mp_1600 printer/Ricoh-Aficio_MP_1600
+#gptofoo ricoh-afc_mp_161 printer/Ricoh-Aficio_MP_161
+#gptofoo ricoh-afc_mp_2000 printer/Ricoh-Aficio_MP_2000
+#gptofoo ricoh-afc_mp_2500 printer/Ricoh-Aficio_MP_2500
+#gptofoo ricoh-afc_mp_2510 printer/Ricoh-Aficio_MP_2510
+#gptofoo ricoh-afc_mp_2550 printer/Ricoh-Aficio_MP_2550
+#gptofoo ricoh-afc_mp_2550b printer/Ricoh-Aficio_MP_2550B
+#gptofoo ricoh-afc_mp_3010 printer/Ricoh-Aficio_MP_3010
+#gptofoo ricoh-afc_mp_3350 printer/Ricoh-Aficio_MP_3350
+#gptofoo ricoh-afc_mp_3350b printer/Ricoh-Aficio_MP_3350B
+#gptofoo ricoh-afc_mp_3500 printer/Ricoh-Aficio_MP_3500
+#gptofoo ricoh-afc_mp_4000 printer/Ricoh-Aficio_MP_4000
+#gptofoo ricoh-afc_mp_4000b printer/Ricoh-Aficio_MP_4000B
+#gptofoo ricoh-afc_mp_4500 printer/Ricoh-Aficio_MP_4500
+#gptofoo ricoh-afc_mp_5000 printer/Ricoh-Aficio_MP_5000
+#gptofoo ricoh-afc_mp_5000b printer/Ricoh-Aficio_MP_5000B
+#gptofoo ricoh-afc_mp_5500 printer/Ricoh-Aficio_MP_5500
+#gptofoo ricoh-afc_mp_6500 printer/Ricoh-Aficio_MP_6500
+#gptofoo ricoh-afc_mp_7500 printer/Ricoh-Aficio_MP_7500
+#gptofoo ricoh-afc_mp_9000 printer/Ricoh-Aficio_MP_9000
+#gptofoo samsung-ml-1250 printer/Samsung-ML-1250
+#gptofoo samsung-ml-1450 printer/Samsung-ML-1450
+#gptofoo samsung-ml-1450ps printer/Samsung-ML-1450PS
+#gptofoo samsung-ml-1650 printer/Samsung-ML-1650
+#gptofoo samsung-ml-1651n printer/Samsung-ML-1651N
+#gptofoo samsung-ml-1750 printer/Samsung-ML-1750
+#gptofoo samsung-ml-2150 printer/Samsung-ML-2150
+#gptofoo samsung-ml-2150ps printer/Samsung-ML-2150PS
+#gptofoo samsung-ml-2151n printer/Samsung-ML-2151N
+#gptofoo samsung-ml-2151nps printer/Samsung-ML-2151NPS
+#gptofoo samsung-ml-2152w printer/Samsung-ML-2152W
+#gptofoo samsung-ml-2152wps printer/Samsung-ML-2152WPS
+#gptofoo samsung-ml-2250 printer/Samsung-ML-2250
+#gptofoo samsung-ml-2550 printer/Samsung-ML-2550
+#gptofoo samsung-ml-2551n printer/Samsung-ML-2551N
+#gptofoo samsung-ml-2552w printer/Samsung-ML-2552W
+#gptofoo samsung-ml-7300 printer/Samsung-ML-7300
+#gptofoo samsung-ml-7300n printer/Samsung-ML-7300N
+#gptofoo savin-2522 printer/Savin-2522
+#gptofoo savin-2527 printer/Savin-2527
+#gptofoo savin-2532 printer/Savin-2532
+#gptofoo savin-2535 printer/Savin-2535
+#gptofoo savin-2235 printer/Savin-2235
+#gptofoo savin-2545 printer/Savin-2545
+#gptofoo savin-2245 printer/Savin-2245
+#gptofoo savin-2560 printer/Savin-2560
+#gptofoo savin-2575 printer/Savin-2575
+#gptofoo savin-3515 printer/Savin-3515
+#gptofoo savin-40105 printer/Savin-40105
+#gptofoo savin-4015 printer/Savin-4015
+#gptofoo savin-4018 printer/Savin-4018
+#gptofoo savin-4018d printer/Savin-4018d
+#gptofoo savin-4022 printer/Savin-4022
+#gptofoo savin-4027 printer/Savin-4027
+#gptofoo savin-4035 printer/Savin-4035
+#gptofoo savin-4135g printer/Savin-4135g
+#gptofoo savin-4035e printer/Savin-4035e
+#gptofoo savin-4135eg printer/Savin-4135eG
+#gptofoo savin-4045 printer/Savin-4045
+#gptofoo savin-4145g printer/Savin-4145g
+#gptofoo savin-4045e printer/Savin-4045e
+#gptofoo savin-4145eg printer/Savin-4145eG
+#gptofoo savin-4051 printer/Savin-4051
+#gptofoo savin-4060 printer/Savin-4060
+#gptofoo savin-4075 printer/Savin-4075
+#gptofoo savin-4090 printer/Savin-4090
+#gptofoo savin-7025 printer/Savin-7025
+#gptofoo savin-8016 printer/Savin-8016
+#gptofoo savin-8020 printer/Savin-8020
+#gptofoo savin-8020d printer/Savin-8020d
+#gptofoo savin-8025 printer/Savin-8025
+#gptofoo savin-8025e printer/Savin-8025e
+#gptofoo savin-8030 printer/Savin-8030
+#gptofoo savin-8030e printer/Savin-8030e
+#gptofoo savin-8035 printer/Savin-8035
+#gptofoo savin-8035g printer/Savin-8035g
+#gptofoo savin-8035e printer/Savin-8035e
+#gptofoo savin-8045 printer/Savin-8045
+#gptofoo savin-8045g printer/Savin-8045g
+#gptofoo savin-8045e printer/Savin-8045e
+#gptofoo savin-8055 printer/Savin-8055
+#gptofoo savin-8065 printer/Savin-8065
+#gptofoo savin-8075 printer/Savin-8075
+#gptofoo savin-8090 printer/Savin-8090
+#gptofoo savin-8110 printer/Savin-8110
+#gptofoo savin-8135 printer/Savin-8135
+#gptofoo savin-816 printer/Savin-816
+#gptofoo savin-9016 printer/Savin-9016
+#gptofoo savin-9021d printer/Savin-9021d
+#gptofoo savin-9025 printer/Savin-9025
+#gptofoo savin-9025b printer/Savin-9025b
+#gptofoo savin-9033 printer/Savin-9033
+#gptofoo savin-9033b printer/Savin-9033b
+#gptofoo savin-9040 printer/Savin-9040
+#gptofoo savin-9040b printer/Savin-9040b
+#gptofoo savin-9050 printer/Savin-9050
+#gptofoo savin-9050b printer/Savin-9050b
+#gptofoo hp-lj_1160 printer/HP-LaserJet_1160
+#gptofoo hp-lj_1320 printer/HP-LaserJet_1320
+#gptofoo hp-lj_2410 printer/HP-LaserJet_2410
+#gptofoo hp-lj_2420 printer/HP-LaserJet_2420
+#gptofoo hp-lj_2430 printer/HP-LaserJet_2430
+#gptofoo hp-lj_3015 printer/HP-LaserJet_3015
+#gptofoo hp-lj_3020 printer/HP-LaserJet_3020
+#gptofoo hp-lj_3030 printer/HP-LaserJet_3030
+#gptofoo hp-lj_3050 printer/HP-LaserJet_3050
+#gptofoo hp-lj_3052 printer/HP-LaserJet_3052
+#gptofoo hp-lj_3055 printer/HP-LaserJet_3055
+#gptofoo hp-lj_3380 printer/HP-LaserJet_3380
+#gptofoo hp-lj_3390 printer/HP-LaserJet_3390
+#gptofoo hp-lj_3392 printer/HP-LaserJet_3392
+#gptofoo hp-lj_4240 printer/HP-LaserJet_4240
+#gptofoo hp-lj_4250 printer/HP-LaserJet_4250
+#gptofoo hp-lj_4345_mfp printer/HP-LaserJet_4345_mfp
+#gptofoo hp-lj_4350 printer/HP-LaserJet_4350
+#gptofoo hp-lj_5200 printer/HP-LaserJet_5200
+#gptofoo hp-lj_5200l printer/HP-LaserJet_5200L
+#gptofoo hp-lj_9040 printer/HP-LaserJet_9040
+#gptofoo hp-lj_9040_mfp printer/HP-LaserJet_9040_MFP
+#gptofoo hp-lj_9050 printer/HP-LaserJet_9050
+#gptofoo hp-lj_9050_mfp printer/HP-LaserJet_9050_MFP
+#gptofoo hp-lj_m3027_mfp printer/HP-LaserJet_M3027_MFP
+#gptofoo hp-lj_m3035_mfp printer/HP-LaserJet_M3035_MFP
+#gptofoo hp-lj_m4345_mfp printer/HP-LaserJet_M4345_MFP
+#gptofoo hp-lj_m5025_mfp printer/HP-LaserJet_M5025_MFP
+#gptofoo hp-lj_m5035_mfp printer/HP-LaserJet_M5035_MFP
+#gptofoo hp-lj_p2010 printer/HP-LaserJet_P2010
+#gptofoo hp-lj_p2015 printer/HP-LaserJet_P2015
+#gptofoo hp-lj_p3004 printer/HP-LaserJet_P3004
+#gptofoo hp-lj_p3005 printer/HP-LaserJet_P3005
diff --git a/src/foomatic/printers.c b/src/foomatic/printers.c
index 24643e7..af22394 100644
--- a/src/foomatic/printers.c
+++ b/src/foomatic/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.11 2007/03/05 00:04:00 tillkamppeter Exp $"
+ * "$Id: printers.c,v 1.13 2008/10/19 13:57:26 rlk Exp $"
  *
  *   Dump the per-printer options for the OpenPrinting database
  *
@@ -39,6 +39,9 @@ main(int argc, char **argv)
 	     stp_printer_get_long_name(p));
       printf("$printer_make{'%s'} = '%s';\n", stp_printer_get_driver(p),
 	     stp_printer_get_manufacturer(p));
+      printf("$printer_family{'%s'} = '%s';\n", stp_printer_get_driver(p),
+	     stp_printer_get_family(p));
+      printf("push @printer_list, '%s';\n", stp_printer_get_driver(p));
     }
   return 0;
 }
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index d3d2c88..22e953d 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -45,7 +45,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -71,7 +72,7 @@ ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK =  \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -119,6 +120,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -139,6 +141,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -171,6 +174,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -191,9 +195,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -220,6 +225,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -336,8 +342,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -399,8 +405,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -412,8 +418,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -423,13 +429,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index bdd8fed..9a75815 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.20 2008/04/22 23:59:50 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.21 2008/07/05 03:43:26 rlk Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -711,7 +711,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
 	  STP_DEBUG(fprintf(stderr, "ijsgutenprint: paper size %f %f %s\n", w, h, vbuf));
 	  stp_set_page_width(img->v, w);
 	  stp_set_page_height(img->v, h);
-	  if ((p = stp_get_papersize_by_size(h, w)) != NULL)
+	  if ((p = stp_get_papersize_by_size_exact(h, w)) != NULL)
 	    {
 	      STP_DEBUG(fprintf(stderr, "ijsgutenprint: Found page size %s\n", p->name));
 	      stp_set_string_parameter(img->v, "PageSize", p->name);
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index 5a45632..67c22c4 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -46,7 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -65,7 +66,7 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(GUTENPRINTUI2_LIBS)
 am_print_OBJECTS = $(am__objects_1) print-print.$(OBJEXT)
 print_OBJECTS = $(am_print_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -113,6 +114,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -133,6 +135,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -165,6 +168,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -185,9 +189,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -214,6 +219,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -340,8 +346,8 @@ install-gimp2_plug_inPROGRAMS: $(gimp2_plug_in_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gimp2_plug_indir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gimp2_plug_indir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gimp2_plug_indir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gimp2_plug_inPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gimp2_plug_indir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -409,8 +415,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -422,8 +428,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -433,13 +439,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/gimp2/print-gutenprint.c b/src/gimp2/print-gutenprint.c
index 1fab376..56bf111 100644
--- a/src/gimp2/print-gutenprint.c
+++ b/src/gimp2/print-gutenprint.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-gutenprint.c,v 1.1 2006/07/04 02:57:59 rlk Exp $"
+ * "$Id: print-gutenprint.c,v 1.2 2008/07/04 14:29:28 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -56,7 +56,8 @@ do_gimp_install_procedure(const char *blurb, const char *help,
   gimp_plugin_menu_register ((BAD_CONST_CHAR) "file_print_gutenprint",
 			     (BAD_CONST_CHAR) "<Image>/File/Send");
   gimp_plugin_icon_register ((BAD_CONST_CHAR) "file_print_gutenprint",
-                             GIMP_ICON_TYPE_STOCK_ID, GTK_STOCK_PRINT);
+                             GIMP_ICON_TYPE_STOCK_ID,
+			     (BAD_CONST_CHAR) GTK_STOCK_PRINT);
 #endif
 }
 			  
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 8e850a6..35e10e3 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 VPATH = @srcdir@
@@ -46,7 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -80,7 +81,7 @@ libgutenprintui2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(libgutenprintui2_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_LIBGUTENPRINTUI2_TRUE@am_libgutenprintui2_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI2_TRUE@	$(libdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,6 +140,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -159,6 +161,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -191,6 +194,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -211,9 +215,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -240,6 +245,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -389,8 +395,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -398,8 +404,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -552,8 +558,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -565,8 +571,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -576,13 +582,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index cf262e5..1a915e5 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.17 2008/01/22 02:36:42 rlk Exp $"
+ * "$Id: panel.c,v 1.18 2008/07/09 01:32:40 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -261,6 +261,7 @@ static void set_printer_defaults (void);
 static void redraw_color_swatch (void);
 static void color_update (GtkAdjustment *adjustment);
 static void dimension_update (GtkAdjustment *adjustment);
+static void integer_update (GtkAdjustment *adjustment);
 static void set_controls_active (GtkObject *checkbutton, gpointer optno);
 static void update_adjusted_thumbnail (gboolean regenerate_image);
 
@@ -882,6 +883,7 @@ populate_options(const stp_vars_t *v)
 	      break;
 	    case STP_PARAMETER_TYPE_DOUBLE:
 	    case STP_PARAMETER_TYPE_DIMENSION:
+	    case STP_PARAMETER_TYPE_INT:
 	      if (opt->info.flt.adjustment)
 		{
 		  gtk_widget_destroy
@@ -971,6 +973,14 @@ populate_options(const stp_vars_t *v)
 	      opt->info.flt.scale = 1.0;
 	      opt->is_active = desc.is_active;
 	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      opt->info.flt.adjustment = NULL;
+	      opt->info.flt.upper = desc.bounds.integer.upper;
+	      opt->info.flt.lower = desc.bounds.integer.lower;
+	      opt->info.flt.deflt = desc.deflt.dimension;
+	      opt->info.flt.scale = 1.0;
+	      opt->is_active = desc.is_active;
+	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
 	      opt->info.curve.label = NULL;
 	      opt->info.curve.button = NULL;
@@ -1057,6 +1067,7 @@ populate_option_table(GtkWidget *table, int p_class)
 	    {
 	    case STP_PARAMETER_TYPE_STRING_LIST:
 	    case STP_PARAMETER_TYPE_DIMENSION:
+	    case STP_PARAMETER_TYPE_INT:
 	    case STP_PARAMETER_TYPE_DOUBLE:
 	    case STP_PARAMETER_TYPE_CURVE:
 	    case STP_PARAMETER_TYPE_BOOLEAN:
@@ -1182,6 +1193,25 @@ populate_option_table(GtkWidget *table, int p_class)
 		stp_set_dimension_parameter_active(pv->v, desc->name,
 						   STP_PARAMETER_INACTIVE);
 	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]);
+	      stpui_create_scale_entry(opt, GTK_TABLE(table), 0,
+				       vpos[desc->p_level][desc->p_type]++,
+				       gettext(desc->text), 200, 0,
+				       opt->info.flt.deflt,
+				       opt->info.flt.lower,
+				       opt->info.flt.upper,
+				       1, 10, 0, TRUE, 0, 0, NULL,
+				       !(desc->is_mandatory));
+	      stpui_set_adjustment_tooltip(opt->info.flt.adjustment,
+					   gettext(desc->help));
+	      g_signal_connect(G_OBJECT(opt->info.flt.adjustment),
+			       "value_changed",
+			       G_CALLBACK(integer_update), opt);
+	      if (desc->p_level > MAXIMUM_PARAMETER_LEVEL)
+		stp_set_int_parameter_active(pv->v, desc->name,
+					     STP_PARAMETER_INACTIVE);
+	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
 	      xcurve = stp_get_curve_parameter(pv->v, opt->fast_desc->name);
 	      if (xcurve)
@@ -1209,10 +1239,6 @@ populate_option_table(GtkWidget *table, int p_class)
 		stp_set_boolean_parameter_active(pv->v, desc->name,
 						 STP_PARAMETER_INACTIVE);
 	      break;
-	    case STP_PARAMETER_TYPE_INT:
-	      stp_set_int_parameter_active(pv->v, opt->fast_desc->name,
-					   STP_PARAMETER_INACTIVE);
-	      break;
 	    case STP_PARAMETER_TYPE_RAW:
 	      stp_set_raw_parameter_active(pv->v, opt->fast_desc->name,
 					   STP_PARAMETER_INACTIVE);
@@ -1259,6 +1285,7 @@ set_options_active(const char *omit)
 	  break;
 	case STP_PARAMETER_TYPE_DOUBLE:
 	case STP_PARAMETER_TYPE_DIMENSION:
+	case STP_PARAMETER_TYPE_INT:
 	  adj = opt->info.flt.adjustment;
 	  if (adj)
 	    {
@@ -3088,6 +3115,21 @@ do_color_updates (void)
 	      else
 		set_adjustment_active(opt, FALSE, TRUE);
 	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      if (stp_check_int_parameter(pv->v, opt->fast_desc->name,
+					  STP_PARAMETER_INACTIVE))
+		{
+		  gtk_adjustment_set_value
+		  (GTK_ADJUSTMENT(opt->info.flt.adjustment),
+		   (stp_get_int_parameter(pv->v, opt->fast_desc->name)));
+		}
+	      if (stp_check_int_parameter(pv->v, opt->fast_desc->name,
+					  STP_PARAMETER_ACTIVE) ||
+		  opt->fast_desc->is_mandatory)
+		set_adjustment_active(opt, TRUE, TRUE);
+	      else
+		set_adjustment_active(opt, FALSE, TRUE);
+	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
 	      if (stp_check_curve_parameter(pv->v, opt->fast_desc->name,
 					    STP_PARAMETER_ACTIVE) ||
@@ -5205,6 +5247,30 @@ dimension_update (GtkAdjustment *adjustment)
 }
 
 static void
+integer_update (GtkAdjustment *adjustment)
+{
+  int i;
+  for (i = 0; i < current_option_count; i++)
+    {
+      option_t *opt = &(current_options[i]);
+      if (opt->fast_desc->p_type == STP_PARAMETER_TYPE_INT &&
+	  opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL &&
+	  opt->info.flt.adjustment &&
+	  adjustment == GTK_ADJUSTMENT(opt->info.flt.adjustment))
+	{
+	  invalidate_preview_thumbnail ();
+	  if (stp_get_int_parameter(pv->v, opt->fast_desc->name) !=
+	      (int) adjustment->value)
+	    {
+	      stp_set_int_parameter(pv->v, opt->fast_desc->name,
+				    (int) adjustment->value);
+	      update_adjusted_thumbnail(FALSE);
+	    }
+	}
+    }
+}
+
+static void
 set_controls_active (GtkObject *checkbutton, gpointer xopt)
 {
   option_t *opt = (option_t *) xopt;
@@ -5231,7 +5297,7 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	case STP_PARAMETER_TYPE_DIMENSION:
 	  set_adjustment_active(opt, TRUE, FALSE);
 	  if (! stp_check_dimension_parameter(pv->v, opt->fast_desc->name,
-					  STP_PARAMETER_INACTIVE))
+					      STP_PARAMETER_INACTIVE))
 	    {
 	      stp_describe_parameter(pv->v, opt->fast_desc->name, &desc);
 	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
@@ -5241,6 +5307,19 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	  stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
 					     STP_PARAMETER_ACTIVE);
 	  break;
+	case STP_PARAMETER_TYPE_INT:
+	  set_adjustment_active(opt, TRUE, FALSE);
+	  if (! stp_check_int_parameter(pv->v, opt->fast_desc->name,
+					    STP_PARAMETER_INACTIVE))
+	    {
+	      stp_describe_parameter(pv->v, opt->fast_desc->name, &desc);
+	      stp_set_int_parameter(pv->v, opt->fast_desc->name,
+				    desc.deflt.integer);
+	      stp_parameter_description_destroy(&desc);
+	    }
+	  stp_set_int_parameter_active(pv->v, opt->fast_desc->name,
+				       STP_PARAMETER_ACTIVE);
+	  break;
 	case STP_PARAMETER_TYPE_CURVE:
 	  set_curve_active(opt, TRUE, FALSE);
 	  if (! stp_check_curve_parameter(pv->v, opt->fast_desc->name,
@@ -5303,6 +5382,11 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	  stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
 					     STP_PARAMETER_INACTIVE);
 	  break;
+	case STP_PARAMETER_TYPE_INT:
+	  set_adjustment_active(opt, FALSE, FALSE);
+	  stp_set_int_parameter_active(pv->v, opt->fast_desc->name,
+				       STP_PARAMETER_INACTIVE);
+	  break;
 	case STP_PARAMETER_TYPE_CURVE:
 	  set_curve_active(opt, FALSE, FALSE);
 	  stp_set_curve_parameter_active(pv->v, opt->fast_desc->name,
@@ -5340,39 +5424,39 @@ set_one_default(option_t *opt)
     {
     case STP_PARAMETER_TYPE_DOUBLE:
       active = stp_get_float_parameter_active(pv->v, opt->fast_desc->name);
-      stp_set_float_parameter(pv->v, opt->fast_desc->name,
-			      opt->info.flt.deflt);
-      stp_set_float_parameter_active(pv->v, opt->fast_desc->name,
-				     active);
+      stp_set_float_parameter(pv->v, opt->fast_desc->name, opt->info.flt.deflt);
+      stp_set_float_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_DIMENSION:
       unit_scaler = units[pv->unit].scale;
-      active = stp_get_dimension_parameter_active(pv->v,
-					   opt->fast_desc->name);
+      active = stp_get_dimension_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
 				  opt->info.flt.deflt * unit_scaler);
-      stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name,
-					 active);
+      stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, active);
+      break;
+    case STP_PARAMETER_TYPE_INT:
+      unit_scaler = units[pv->unit].scale;
+      active = stp_get_int_parameter_active(pv->v, opt->fast_desc->name);
+      stp_set_int_parameter(pv->v, opt->fast_desc->name,
+			    (int) opt->info.flt.deflt);
+      stp_set_int_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_BOOLEAN:
       active = stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_boolean_parameter(pv->v, opt->fast_desc->name,
 				opt->info.bool.deflt);
-      stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name,
-				       active);
+      stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_STRING_LIST:
       active = stp_get_string_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_string_parameter(pv->v, opt->fast_desc->name,
 			       opt->info.list.default_val);
-      stp_set_string_parameter_active(pv->v, opt->fast_desc->name,
-				      active);
+      stp_set_string_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     case STP_PARAMETER_TYPE_FILE:
       active = stp_get_file_parameter_active(pv->v, opt->fast_desc->name);
       stp_set_file_parameter(pv->v, opt->fast_desc->name, "");
-      stp_set_file_parameter_active(pv->v, opt->fast_desc->name,
-				    active);
+      stp_set_file_parameter_active(pv->v, opt->fast_desc->name, active);
       break;
     default:
       break;
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index e8b5aec..77e8cab 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.17 2008/01/31 12:56:09 m0m Exp $"
+ * "$Id: plist.c,v 1.18 2008/07/04 14:29:28 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -1631,7 +1631,6 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 				  _exit(0);
 				}
 			    }
-			  /* NOTREACHED */
 			  write(syncfd[1], "Done", 5);
 			  _exit(0);
 			}
@@ -1835,5 +1834,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.17 2008/01/31 12:56:09 m0m Exp $".
+ * End of "$Id: plist.c,v 1.18 2008/07/04 14:29:28 rlk Exp $".
  */
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 077713f..87c2fa7 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.99 2008/04/28 02:06:44 rlk Exp $
+## $Id: Makefile.am,v 1.103 2008/08/13 07:35:53 easysw Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,6 @@ include $(top_srcdir)/scripts/global.mk
 ## Variables
 
 pkgconfigdatadir = $(libdir)/pkgconfig
-pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
 pkgmoduledir = $(pkglibdir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/modules
 
 
@@ -66,7 +65,6 @@ print_escp2_la_SOURCES = \
 	print-escp2.h \
 	print-escp2-data.c \
 	escp2-channels.c \
-	escp2-inks.c \
 	escp2-papers.c \
 	escp2-resolutions.c
 print_escp2_la_LDFLAGS = -module -avoid-version
@@ -165,37 +163,9 @@ libgutenprint_la_LDFLAGS = $(libgutenprint_version) \
 
 pkgconfigdata_DATA = gutenprint.pc
 
-pkgxmldata_DATA = \
-	dither-matrix-1x1.xml \
-	dither-matrix-2x1.xml \
-	dither-matrix-4x1.xml \
-	papers.xml \
-	printers.xml
-
-
-
-## Rules
-
-all-local: xmli18n-tmp.h
-
-
-xmli18n-tmp.h:  $(srcdir)/papers.xml $(srcdir)/printers.xml
-# Pull out translatable strings from XML files.  This is crude, but
-# works for now.
-	sed -e '/description.*value/!d' \
-	  -e 's/.*description.*value="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/papers.xml > $@;
-	sed -e '/printer.*name/!d' \
-	  -e 's/.*printer.*name="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/printers.xml >> $@;
-
-dist-hook: xmli18n-tmp.h
-# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
-
 
 ## Clean
 
-CLEANFILES = xmli18n-tmp.h
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = $(pkgxmldata_DATA) libgutenprint.sym
+EXTRA_DIST = libgutenprint.sym
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 3af179d..cd04b9d 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 VPATH = @srcdir@
@@ -45,7 +45,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -61,7 +62,7 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" \
-	"$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgxmldatadir)"
+	"$(DESTDIR)$(pkgconfigdatadir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 pkgmoduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(pkgmodule_LTLIBRARIES)
@@ -88,16 +89,15 @@ am__libgutenprint_la_SOURCES_DIST = array.c bit-ops.c channel.c \
 	color-conversion.h color-conversions.c print-canon.c \
 	print-canon.h canon-inks.h canon-media.h canon-modes.h \
 	canon-printers.h print-escp2.c escp2-driver.c print-escp2.h \
-	print-escp2-data.c escp2-channels.c escp2-inks.c \
-	escp2-papers.c escp2-resolutions.c print-lexmark.c print-pcl.c \
-	print-ps.c xmlppd.c xmlppd.h print-olympus.c print-raw.c
+	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
 am__objects_4 = print-canon.lo
 am__objects_5 = print-escp2.lo escp2-driver.lo print-escp2-data.lo \
-	escp2-channels.lo escp2-inks.lo escp2-papers.lo \
-	escp2-resolutions.lo
+	escp2-channels.lo escp2-papers.lo escp2-resolutions.lo
 am__objects_6 = print-lexmark.lo
 am__objects_7 = print-pcl.lo
 am__objects_8 = print-ps.lo xmlppd.lo
@@ -136,8 +136,8 @@ print_dyesub_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 @BUILD_MODULES_TRUE@am_print_dyesub_la_rpath = -rpath $(pkgmoduledir)
 print_escp2_la_LIBADD =
 am_print_escp2_la_OBJECTS = print-escp2.lo escp2-driver.lo \
-	print-escp2-data.lo escp2-channels.lo escp2-inks.lo \
-	escp2-papers.lo escp2-resolutions.lo
+	print-escp2-data.lo escp2-channels.lo escp2-papers.lo \
+	escp2-resolutions.lo
 print_escp2_la_OBJECTS = $(am_print_escp2_la_OBJECTS)
 print_escp2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -171,7 +171,7 @@ print_raw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(print_raw_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_MODULES_TRUE@am_print_raw_la_rpath = -rpath $(pkgmoduledir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -194,8 +194,7 @@ DIST_SOURCES = $(color_traditional_la_SOURCES) \
 	$(print_lexmark_la_SOURCES) $(print_pcl_la_SOURCES) \
 	$(print_ps_la_SOURCES) $(print_raw_la_SOURCES)
 pkgconfigdataDATA_INSTALL = $(INSTALL_DATA)
-pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfigdata_DATA) $(pkgxmldata_DATA)
+DATA = $(pkgconfigdata_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -230,6 +229,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -250,6 +250,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -282,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -302,9 +304,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -331,6 +334,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -401,7 +405,6 @@ 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
 pkgconfigdatadir = $(libdir)/pkgconfig
-pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
 pkgmoduledir = $(pkglibdir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/modules
 @BUILD_MODULES_TRUE@pkgmodule_LTLIBRARIES = \
 @BUILD_MODULES_TRUE@	color-traditional.la \
@@ -434,7 +437,6 @@ print_escp2_la_SOURCES = \
 	print-escp2.h \
 	print-escp2-data.c \
 	escp2-channels.c \
-	escp2-inks.c \
 	escp2-papers.c \
 	escp2-resolutions.c
 
@@ -520,17 +522,8 @@ libgutenprint_la_LDFLAGS = $(libgutenprint_version) \
 # using a linker version script.
 #	-export-symbols $(srcdir)/libgutenprint.sym
 pkgconfigdata_DATA = gutenprint.pc
-pkgxmldata_DATA = \
-	dither-matrix-1x1.xml \
-	dither-matrix-2x1.xml \
-	dither-matrix-4x1.xml \
-	papers.xml \
-	printers.xml
-
-# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
-CLEANFILES = xmli18n-tmp.h
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = $(pkgxmldata_DATA) libgutenprint.sym
+EXTRA_DIST = libgutenprint.sym
 all: all-am
 
 .SUFFIXES:
@@ -572,8 +565,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -581,8 +574,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -599,8 +592,8 @@ install-pkgmoduleLTLIBRARIES: $(pkgmodule_LTLIBRARIES)
 	@list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgmoduledir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgmoduledir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgmoduledir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgmoduledir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -608,8 +601,8 @@ uninstall-pkgmoduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgmodule_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkgmoduledir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkgmoduledir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgmoduledir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgmoduledir)/$$p"; \
 	done
 
 clean-pkgmoduleLTLIBRARIES:
@@ -662,7 +655,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-very-fast.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-channels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-driver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-inks.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-papers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-resolutions.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generic-options.Plo@am__quote@
@@ -738,31 +730,14 @@ uninstall-pkgconfigdataDATA:
 	  echo " rm -f '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \
 	done
-install-pkgxmldataDATA: $(pkgxmldata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
-	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
-	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
-	done
-
-uninstall-pkgxmldataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -774,8 +749,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -785,13 +760,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -830,14 +804,11 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" "$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgxmldatadir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgmoduledir)" "$(DESTDIR)$(pkgconfigdatadir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -857,7 +828,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -888,7 +858,7 @@ info: info-am
 info-am:
 
 install-data-am: install-pkgconfigdataDATA \
-	install-pkgmoduleLTLIBRARIES install-pkgxmldataDATA
+	install-pkgmoduleLTLIBRARIES
 
 install-dvi: install-dvi-am
 
@@ -925,27 +895,26 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA \
-	uninstall-pkgmoduleLTLIBRARIES uninstall-pkgxmldataDATA
+	uninstall-pkgmoduleLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-pkgmoduleLTLIBRARIES ctags dist-hook distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-pkgconfigdataDATA install-pkgmoduleLTLIBRARIES \
-	install-pkgxmldataDATA install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-pkgconfigdataDATA uninstall-pkgmoduleLTLIBRARIES \
-	uninstall-pkgxmldataDATA
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool clean-pkgmoduleLTLIBRARIES \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-pkgconfigdataDATA \
+	install-pkgmoduleLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA \
+	uninstall-pkgmoduleLTLIBRARIES
 
 
 @SET_MAKE@
@@ -963,20 +932,6 @@ $(top_builddir)/src/gutenprintui/libgutenprintui.la:
 $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	cd $(top_builddir)/src/gutenprintui2; \
 	$(MAKE)
-
-all-local: xmli18n-tmp.h
-
-xmli18n-tmp.h:  $(srcdir)/papers.xml $(srcdir)/printers.xml
-# Pull out translatable strings from XML files.  This is crude, but
-# works for now.
-	sed -e '/description.*value/!d' \
-	  -e 's/.*description.*value="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/papers.xml > $@;
-	sed -e '/printer.*name/!d' \
-	  -e 's/.*printer.*name="\([^"]*\)".*/N_("\1");/' \
-	  < $(srcdir)/printers.xml >> $@;
-
-dist-hook: xmli18n-tmp.h
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/main/channel.c b/src/main/channel.c
index 88d316d..278d8e2 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.29 2005/07/14 23:43:30 rlk Exp $"
+ * "$Id: channel.c,v 1.30 2008/08/20 11:49:45 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -88,6 +88,9 @@ typedef struct
   int black_channel;
   int gloss_channel;
   int gloss_physical_channel;
+  double cyan_balance;
+  double magenta_balance;
+  double yellow_balance;
 } stpi_channel_group_t;
 
 
@@ -598,13 +601,16 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
 	}
       cg->gcr_channels = cg->aux_output_channels;
     }
+  cg->cyan_balance = stp_get_float_parameter(v, "CyanBalance");
+  cg->magenta_balance = stp_get_float_parameter(v, "MagentaBalance");
+  cg->yellow_balance = stp_get_float_parameter(v, "YellowBalance");
   stp_dprintf(STP_DBG_INK, v, "stp_channel_initialize:\n");
   stp_dprintf(STP_DBG_INK, v, "   channel_count  %d\n", cg->channel_count);
   stp_dprintf(STP_DBG_INK, v, "   total_channels %d\n", cg->total_channels);
   stp_dprintf(STP_DBG_INK, v, "   input_channels %d\n", cg->input_channels);
   stp_dprintf(STP_DBG_INK, v, "   aux_channels   %d\n", cg->aux_output_channels);
   stp_dprintf(STP_DBG_INK, v, "   gcr_channels   %d\n", cg->gcr_channels);
-  stp_dprintf(STP_DBG_INK, v, "   width          %d\n", cg->width);
+  stp_dprintf(STP_DBG_INK, v, "   width          %d\n", (int) cg->width);
   stp_dprintf(STP_DBG_INK, v, "   ink_limit      %d\n", cg->ink_limit);
   stp_dprintf(STP_DBG_INK, v, "   gloss_limit    %d\n", cg->gloss_limit);
   stp_dprintf(STP_DBG_INK, v, "   max_density    %d\n", cg->max_density);
@@ -612,6 +618,9 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
   stp_dprintf(STP_DBG_INK, v, "   black_channel  %d\n", cg->black_channel);
   stp_dprintf(STP_DBG_INK, v, "   gloss_channel  %d\n", cg->gloss_channel);
   stp_dprintf(STP_DBG_INK, v, "   gloss_physical %d\n", cg->gloss_physical_channel);
+  stp_dprintf(STP_DBG_INK, v, "   cyan           %.3f", cg->cyan_balance);
+  stp_dprintf(STP_DBG_INK, v, "   magenta        %.3f", cg->magenta_balance);
+  stp_dprintf(STP_DBG_INK, v, "   yellow         %.3f", cg->yellow_balance);
   stp_dprintf(STP_DBG_INK, v, "   input_data     %p\n",
 	      (void *) cg->input_data);
   stp_dprintf(STP_DBG_INK, v, "   multi_tmp      %p\n",
@@ -1080,9 +1089,6 @@ do_gcr(const stp_vars_t *v)
   const unsigned short *gcr_lookup;
   unsigned short *output = cg->gcr_data;
   size_t count;
-  double cb = stp_get_float_parameter(v, "CyanBalance");
-  double mb = stp_get_float_parameter(v, "MagentaBalance");
-  double yb = stp_get_float_parameter(v, "YellowBalance");
   int i;
 
   stp_curve_resample(cg->gcr_curve, 65536);
@@ -1098,9 +1104,9 @@ do_gcr(const stp_vars_t *v)
 	    kk = k;
 	  ck = k - kk;
 	  output[0] = kk;
-	  output[1] += ck * cb;
-	  output[2] += ck * mb;
-	  output[3] += ck * yb;
+	  output[1] += ck * cg->cyan_balance;
+	  output[2] += ck * cg->magenta_balance;
+	  output[3] += ck * cg->yellow_balance;
 	}
       output += cg->gcr_channels;
     }
diff --git a/src/main/dither-main.c b/src/main/dither-main.c
index b9ba80a..22ea02b 100644
--- a/src/main/dither-main.c
+++ b/src/main/dither-main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-main.c,v 1.59 2008/02/18 14:20:17 rlk Exp $"
+ * "$Id: dither-main.c,v 1.61 2008/07/04 14:29:28 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -94,7 +94,7 @@ static const stp_parameter_t dither_parameters[] =
        "paper or smears; increase the density if black "
        "regions are not solid."),
     STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-    STP_PARAMETER_LEVEL_ADVANCED, 0, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 0, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "DitherAlgorithm", N_("Dither Algorithm"), N_("Screening Adjustment"),
@@ -105,7 +105,7 @@ static const stp_parameter_t dither_parameters[] =
        "Fast and Very Fast are considerably faster, and work well for text and line art.\n"
        "Hybrid Floyd-Steinberg generally produces inferior output."),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -254,6 +254,8 @@ stpi_set_dither_function(stp_vars_t *v)
 	  (d->x_aspect > 2 || d->y_aspect > 2))
 	d->stpi_dither_type = D_ADAPTIVE_HYBRID;
     }
+  if (d->stpi_dither_type == -1)
+    d->stpi_dither_type = D_ADAPTIVE_HYBRID;
   switch (d->stpi_dither_type)
     {
     case D_PREDITHERED:
diff --git a/src/main/dither-ordered.c b/src/main/dither-ordered.c
index ca119c1..52edb3c 100644
--- a/src/main/dither-ordered.c
+++ b/src/main/dither-ordered.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dither-ordered.c,v 1.28 2008/02/18 14:20:17 rlk Exp $"
+ * "$Id: dither-ordered.c,v 1.30 2008/06/01 03:30:46 rlk Exp $"
  *
  *   Ordered dither algorithm
  *
@@ -180,11 +180,6 @@ print_color_ordered_new(const stpi_dither_t *d, stpi_dither_channel_t *dc,
   unsigned short *where = ord ? ord->lut + (val * levels) : &swhere;
   /*
    * Look for the appropriate range into which the input value falls.
-   * Notice that we use the input, not the error, to decide what dot type
-   * to print (if any).  We actually use the "density" input to permit
-   * the caller to use something other that simply the input value, if it's
-   * desired to use some function of overall density, rather than just
-   * this color's input, for this purpose.
    */
   for (i = levels - 1; i >= 0; i--)
     {
@@ -223,11 +218,6 @@ print_color_ordered(const stpi_dither_t *d, stpi_dither_channel_t *dc, int val,
 
   /*
    * Look for the appropriate range into which the input value falls.
-   * Notice that we use the input, not the error, to decide what dot type
-   * to print (if any).  We actually use the "density" input to permit
-   * the caller to use something other that simply the input value, if it's
-   * desired to use some function of overall density, rather than just
-   * this color's input, for this purpose.
    */
   for (i = levels; i >= 0; i--)
     {
@@ -274,7 +264,7 @@ free_dither_ordered(stpi_dither_t *d)
   int i;
   stpi_dither_channel_t *dc0 = &CHANNEL(d, 0);
   stpi_ordered_t *o0 = dc0->aux_data;
-  stpi_new_ordered_t *no0;
+  stpi_new_ordered_t *no0 = NULL;
   if (o0)
     no0 = o0->ord_new;
   for (i = CHANNEL_COUNT(d) - 1; i >= 0 ; i--)
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 1ca2c94..99c2664 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.75 2008/02/27 00:43:37 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.86 2008/07/06 15:50:56 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -29,3257 +29,439 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "print-escp2.h"
 
+static inkgroup_t *default_black_inkgroup;
 
-#define DECLARE_INK_CHANNEL(name)				\
-static const ink_channel_t name##_channel =			\
-{								\
-  #name,							\
-  name##_subchannels,						\
-  sizeof(name##_subchannels) / sizeof(physical_subchannel_t),	\
-  NULL								\
-}
-
-#define DECLARE_EXTENDED_INK_CHANNEL(name)			\
-static const ink_channel_t name##_channel =			\
-{								\
-  #name,							\
-  name##_subchannels,						\
-  sizeof(name##_subchannels) / sizeof(physical_subchannel_t),	\
-  &name##_curve							\
-}
-
-static hue_curve_t generic_cyan_curve =
-{
-  "CyanCurve",
-  "<?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.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
-  /* B */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
-  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t generic_magenta_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* B */
-  /* B */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* M */
-  /* M */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* R */
-  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t generic_yellow_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* R */
-  /* R */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* Y */
-  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
-  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_cyan_curve =
-{
-  "CyanCurve",
-  "<?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.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
-  /* B */  "1.000 0.875 0.700 0.550 0.400 0.300 0.200 0.100 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
-  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_magenta_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.002 0.050 0.300 0.600 0.800 "  /* M */
-  /* M */  "1.000 1.000 0.850 0.700 0.600 0.500 0.400 0.300 "  /* R */
-  /* R */  "0.200 0.100 0.050 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_yellow_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.050 0.150 "  /* R */
-  /* R */  "0.250 0.350 0.450 0.550 0.650 0.750 0.850 0.950 "  /* Y */
-  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
-  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_red_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.025 0.400 0.600 0.750 0.890 1.000 1.000 1.000 "  /* R */
-  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t r800_blue_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.250 0.475 0.700 0.810 0.875 0.940 1.000 "  /* B */
-  /* B */  "1.000 0.975 0.930 0.875 0.810 0.740 0.650 0.400 "  /* M */
-  /* M */  "0.040 0.002 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_cyan_curve =
-{
-  "CyanCurve",
-  "<?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.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* B */
-  /* B */  "1.000 0.875 0.700 0.550 0.400 0.300 0.200 0.100 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.125 0.250 0.375 0.500 0.625 0.750 0.875 "  /* G */
-  /* G */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_magenta_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.002 0.050 0.300 0.600 0.800 "  /* M */
-  /* M */  "1.000 1.000 0.850 0.700 0.600 0.500 0.400 0.300 "  /* R */
-  /* R */  "0.200 0.100 0.050 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_yellow_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.000 0.000 0.000 0.000 0.000 0.000 0.050 0.150 "  /* R */
-  /* R */  "0.250 0.350 0.450 0.550 0.650 0.750 0.850 0.950 "  /* Y */
-  /* Y */  "1.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000 "  /* G */
-  /* G */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_red_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* B */
-  /* B */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* M */
-  /* M */  "0.025 0.400 0.600 0.750 0.890 1.000 1.000 1.000 "  /* R */
-  /* R */  "1.000 0.875 0.750 0.625 0.500 0.375 0.250 0.125 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-static hue_curve_t picturemate_blue_curve =
-{
-  "CyanCurve",
-  "<?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.000 0.250 0.475 0.700 0.810 0.875 0.940 1.000 "  /* B */
-  /* B */  "1.000 0.975 0.930 0.875 0.810 0.740 0.650 0.400 "  /* M */
-  /* M */  "0.040 0.002 0.000 0.000 0.000 0.000 0.000 0.000 "  /* R */
-  /* R */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* Y */
-  /* Y */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* G */
-  /* G */  "0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 "  /* C */
-  "</sequence>\n"
-  "</curve>\n"
-  "</gutenprint>\n"
-};
-
-
-static const physical_subchannel_t standard_black_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_black);
-
-static const physical_subchannel_t f360_black_subchannels[] =
-{
-  { 0, 0, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_black);
-
-static const physical_subchannel_t x80_black_subchannels[] =
-{
-  { 0, -1, 48, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_black);
-
-static const physical_subchannel_t c80_black_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_black);
-
-static const physical_subchannel_t c120_black_subchannels[] =
-{
-  { 0, 4, 0, 2, "BlackDensity", NULL, NULL, NULL, { 0, 0x40 } }
-};
-
-DECLARE_INK_CHANNEL(c120_black);
-
-static const physical_subchannel_t c64_black_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_black);
-
-static const physical_subchannel_t standard_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_cyan);
-
-static const physical_subchannel_t f360_standard_cyan_subchannels[] =
-{
-  { 2, -1, 1, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_standard_cyan);
-
-static const physical_subchannel_t r800_cyan_subchannels[] =
-{
-  { 2, -1, 1, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_cyan);
-
-static const physical_subchannel_t picturemate_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_cyan);
-
-static const physical_subchannel_t cx3650_standard_cyan_subchannels[] =
-{
-  { 2, -1, 2, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(cx3650_standard_cyan);
-
-static const physical_subchannel_t x80_cyan_subchannels[] =
+static void
+load_subchannel(stp_mxml_node_t *node, stp_mxml_node_t *root, physical_subchannel_t *icl)
 {
-  { 2, -1, 96, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_cyan);
-
-static const physical_subchannel_t c80_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_cyan);
-
-static const physical_subchannel_t c120_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c120_cyan);
-
-static const physical_subchannel_t c64_cyan_subchannels[] =
-{
-  { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_cyan);
-
-static const physical_subchannel_t standard_magenta_subchannels[] =
-{
-  { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_magenta);
-
-static const physical_subchannel_t r800_magenta_subchannels[] =
-{
-  { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_magenta);
-
-static const physical_subchannel_t picturemate_magenta_subchannels[] =
-{
-  { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_magenta);
-
-static const physical_subchannel_t f360_standard_magenta_subchannels[] =
-{
-  { 1, -1, 1, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_standard_magenta);
-
-static const physical_subchannel_t x80_magenta_subchannels[] =
-{
-  { 1, -1, 48, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_magenta);
-
-static const physical_subchannel_t c80_magenta_subchannels[] =
-{
-  { 1, -1, 120, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_magenta);
-
-static const physical_subchannel_t c120_magenta_subchannels[] =
-{
-  { 1, -1, 120, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c120_magenta);
-
-static const physical_subchannel_t c64_magenta_subchannels[] =
-{
-  { 1, -1, 90, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_magenta);
-
-static const physical_subchannel_t standard_yellow_subchannels[] =
-{
-  { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_yellow);
-
-static const physical_subchannel_t x80_yellow_subchannels[] =
-{
-  { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(x80_yellow);
-
-static const physical_subchannel_t c80_yellow_subchannels[] =
-{
-  { 4, -1, 240, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c80_yellow);
-
-static const physical_subchannel_t c120_yellow_subchannels[] =
-{
-  { 4, -1, 240, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c120_yellow);
-
-static const physical_subchannel_t c64_yellow_subchannels[] =
-{
-  { 4, -1, 180, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(c64_yellow);
-
-static const physical_subchannel_t f360_standard_yellow_subchannels[] =
-{
-  { 4, -1, 1, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_standard_yellow);
-
-static const physical_subchannel_t r800_yellow_subchannels[] =
-{
-  { 4, -1, 1, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_yellow);
-
-static const physical_subchannel_t picturemate_yellow_subchannels[] =
-{
-  { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_yellow);
-
-static const physical_subchannel_t r800_red_subchannels[] =
-{
-  { 7, -1, 0, 0, "RedDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_red);
-
-static const physical_subchannel_t picturemate_red_subchannels[] =
-{
-  { 7, -1, 0, 0, "RedDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_red);
-
-static const physical_subchannel_t r800_blue_subchannels[] =
-{
-  { 8, -1, 1, 0, "BlueDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(r800_blue);
-
-static const physical_subchannel_t picturemate_blue_subchannels[] =
-{
-  { 8, -1, 1, 0, "BlueDensity", NULL, NULL, NULL }
-};
-
-DECLARE_EXTENDED_INK_CHANNEL(picturemate_blue);
-
-static const physical_subchannel_t standard_gloss_subchannels[] =
-{
-  { 9, -1, 0, 0, "GlossDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_gloss);
-
-static const physical_subchannel_t f360_gloss_subchannels[] =
-{
-  { 9, -1, 1, 0, "GlossDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_gloss);
-
-static const physical_subchannel_t standard_photo_black_subchannels[] =
-{
-  { 0, 4, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(standard_photo_black);
-
-static const physical_subchannel_t f360_photo_black_subchannels[] =
-{
-  { 0, 4, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_black);
-
-static const physical_subchannel_t r800_matte_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(r800_matte_black);
-
-static const physical_subchannel_t photo_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(photo_black);
-
-static const physical_subchannel_t extended_black_subchannels[] =
-{
-  { 0, 1, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_black);
-
-static const physical_subchannel_t f360_extended_black_subchannels[] =
-{
-  { 0, 1, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_black);
-
-static const physical_subchannel_t photo_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }
-};
-
-DECLARE_INK_CHANNEL(photo_cyan);
-
-static const physical_subchannel_t extended_cyan_subchannels[] =
-{
-  { 2, 1, 0, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_cyan);
-
-static const physical_subchannel_t f360_extended_cyan_subchannels[] =
-{
-  { 2, 1, 1, 0, "CyanDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_cyan);
-
-static const physical_subchannel_t photo_magenta_subchannels[] =
-{
-  { 1, 0, 0, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }
-};
-
-DECLARE_INK_CHANNEL(photo_magenta);
-
-static const physical_subchannel_t extended_magenta_subchannels[] =
-{
-  { 1, 1, 0, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_magenta);
-
-static const physical_subchannel_t f360_extended_magenta_subchannels[] =
-{
-  { 1, 1, 1, 0, "MagentaDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_magenta);
-
-static const physical_subchannel_t photo_yellow_subchannels[] =
-{
-  { 4, 0, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(photo_yellow);
-
-static const physical_subchannel_t f360_photo_yellow_subchannels[] =
-{
-  { 4, 0, 1, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_yellow);
-
-static const physical_subchannel_t j_extended_yellow_subchannels[] =
-{
-  { 4, 2, 0, 0, "YellowDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(j_extended_yellow);
-
-static const physical_subchannel_t extended_photo3_black_subchannels[] =
-{
-  { 0, 3, 0, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(extended_photo3_black);
-
-static const physical_subchannel_t f360_extended_photo3_black_subchannels[] =
-{
-  { 0, 3, 1, 0, "BlackDensity", NULL, NULL, NULL }
-};
-
-DECLARE_INK_CHANNEL(f360_extended_photo3_black);
-
-/* For Japanese 7-color printers, with dark yellow */
-static const physical_subchannel_t photo2_yellow_subchannels[] =
-{
-  { 4, 2, 0, 0, "YellowDensity", "DarkYellowTransition", NULL, NULL },
-  { 4, 0, 0, 0, "YellowDensity", "DarkYellowTransition", "DarkYellowValue", "DarkYellowScale" }
-};
-
-DECLARE_INK_CHANNEL(photo2_yellow);
-
-static const physical_subchannel_t f360_photo2_yellow_subchannels[] =
-{
-  { 4, 2, 0, 0, "YellowDensity", "DarkYellowTransition", NULL, NULL },
-  { 4, 0, 1, 0, "YellowDensity", "DarkYellowTransition", "DarkYellowValue", "DarkYellowScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo2_yellow);
-
-static const physical_subchannel_t photo2_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "GrayValue", "GrayScale" }
-};
-
-DECLARE_INK_CHANNEL(photo2_black);
-
-static const physical_subchannel_t f360_photo2_black_subchannels[] =
-{
-  { 0, 0, 1, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "GrayValue", "GrayScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo2_black);
-
-static const physical_subchannel_t photo3_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "DarkGrayValue", "DarkGrayScale" },
-  { 0, 3, 0, 0, "BlackDensity", "GrayTransition", "LightGrayValue", "LightGrayScale" }
-};
-
-DECLARE_INK_CHANNEL(photo3_black);
-
-static const physical_subchannel_t f360_photo3_black_subchannels[] =
-{
-  { 0, 0, 1, 0, "BlackDensity", NULL, NULL, NULL },
-  { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition", "DarkGrayValue", "DarkGrayScale" },
-  { 0, 3, 1, 0, "BlackDensity", "LightGrayTransition", "LightGrayValue", "LightGrayScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo3_black);
-
-static const physical_subchannel_t quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(quadtone);
-
-static const physical_subchannel_t c80_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 120, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 240, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(c80_quadtone);
-
-static const physical_subchannel_t c120_quadtone_subchannels[] =
-{
-  { 0, 4, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 120, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 240, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(c120_quadtone);
-
-static const physical_subchannel_t c64_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 0, 0, "BlackDensity", "Gray3Transition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 90, 0, "BlackDensity", "Gray2Transition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 180, 0, "BlackDensity", "Gray1Transition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(c64_quadtone);
-
-static const physical_subchannel_t f360_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(f360_quadtone);
-
-static const physical_subchannel_t cx3650_quadtone_subchannels[] =
-{
-  { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL },
-  { 2, -1, 2, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" },
-  { 1, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" },
-  { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" },
-};
-
-DECLARE_INK_CHANNEL(cx3650_quadtone);
-
-static const physical_subchannel_t f360_photo_cyan_subchannels[] =
-{
-  { 2, 0, 1, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_cyan);
-
-static const physical_subchannel_t f360x_photo_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 1, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }
-};
-
-DECLARE_INK_CHANNEL(f360x_photo_cyan);
-
-static const physical_subchannel_t f360_photo_magenta_subchannels[] =
-{
-  { 1, 0, 1, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }
-};
-
-DECLARE_INK_CHANNEL(f360_photo_magenta);
-
-static const physical_subchannel_t f360x_photo_magenta_subchannels[] =
-{
-  { 1, 0, 0, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 1, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }
-};
-
-DECLARE_INK_CHANNEL(f360x_photo_magenta);
-
-static const physical_subchannel_t claria_black_subchannels[] =
-{
-  { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_black);
-
-static const physical_subchannel_t claria_yellow_subchannels[] =
-{
-  { 4, 0, 2, 0, "YellowDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_yellow);
-
-static const physical_subchannel_t claria_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_cyan);
-
-static const physical_subchannel_t claria_photo_cyan_subchannels[] =
-{
-  { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL },
-  { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" },
-};
-
-DECLARE_INK_CHANNEL(claria_photo_cyan);
-
-static const physical_subchannel_t extended_claria_cyan_subchannels[] =
-{
-  { 2, 1, 2, 0, "CyanDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(extended_claria_cyan);
-
-static const physical_subchannel_t claria_magenta_subchannels[] =
-{
-  { 1, 0, 2, 0, "MagentaDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(claria_magenta);
-
-static const physical_subchannel_t claria_photo_magenta_subchannels[] =
-{
-  { 1, 0, 2, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL },
-  { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" },
-};
-
-DECLARE_INK_CHANNEL(claria_photo_magenta);
-
-static const physical_subchannel_t extended_claria_magenta_subchannels[] =
-{
-  { 1, 1, 0, 0, "MagentaDensity", NULL, NULL, NULL },
-};
-
-DECLARE_INK_CHANNEL(extended_claria_magenta);
-
-
-#define DECLARE_CHANNEL_SET(name)			\
-static const channel_set_t name##_channel_set =		\
-{							\
-  #name " channel set",					\
-  name##_channels,					\
-  NULL,							\
-  sizeof(name##_channels) / sizeof(ink_channel_t *),	\
-  0							\
-}
-
-#define DECLARE_AUX_CHANNEL_SET(name, aux)		\
-static const channel_set_t name##_##aux##_channel_set =	\
-{							\
-  #name " channel set",					\
-  name##_channels,					\
-  aux##_channels,					\
-  sizeof(name##_channels) / sizeof(ink_channel_t *),	\
-  sizeof(aux##_channels) / sizeof(ink_channel_t *),	\
+  const char *name;
+  stp_mxml_node_t *child = node->child;
+  name = stp_mxmlElementGetAttr(node, "color");
+  if (name)
+    icl->color = stp_xmlstrtol(name);
+  name = stp_mxmlElementGetAttr(node, "subchannel");
+  if (name)
+    icl->subchannel = stp_xmlstrtol(name);
+  else
+    icl->subchannel = -1;
+  name = stp_mxmlElementGetAttr(node, "headOffset");
+  if (name)
+    icl->head_offset = stp_xmlstrtol(name);
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  const char *param = child->value.element.name;
+	  name = stp_mxmlElementGetAttr(child, "name");
+	  if (name && !strcmp(param, "ChannelDensityParam"))
+	    icl->channel_density = stp_strdup(name);
+	  else if (name && !strcmp(param, "SubchannelTransitionParam"))
+	    icl->subchannel_transition = stp_strdup(name);
+	  else if (name && !strcmp(param, "SubchannelValueParam"))
+	    icl->subchannel_value = stp_strdup(name);
+	  else if (name && !strcmp(param, "SubchannelScaleParam"))
+	    icl->subchannel_scale = stp_strdup(name);
+	  else if (!strcmp(param, "SplitChannels"))
+	    {
+	      if (stp_mxmlElementGetAttr(child, "count"))
+		icl->split_channel_count =
+		  stp_xmlstrtoul(stp_mxmlElementGetAttr(child, "count"));
+	      if (icl->split_channel_count > 0)
+		{
+		  char *endptr;
+		  int count = 0;
+		  stp_mxml_node_t *cchild = child->child;
+		  icl->split_channels =
+		    stp_zalloc(sizeof(short) * icl->split_channel_count);
+		  while (cchild && count < icl->split_channel_count)
+		    {
+		      if (cchild->type == STP_MXML_TEXT)
+			{
+			  unsigned val =
+			    strtoul(cchild->value.text.string, &endptr, 0);
+			  if (endptr)
+			    icl->split_channels[count++] = val;
+			}
+		      cchild = cchild->next;
+		    }
+		}
+	    }
+	}
+      child = child->next;
+    }
 }
 
-
-/*
- ****************************************************************
- *                                                              *
- * Grayscale                                                    *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const standard_gloss_channels[] =
-{
-  &standard_gloss_channel
-};
-
-static const ink_channel_t *const f360_gloss_channels[] =
-{
-  &f360_gloss_channel
-};
-
-static const ink_channel_t *const standard_black_channels[] =
-{
-  &standard_black_channel
-};
-
-DECLARE_CHANNEL_SET(standard_black);
-
-static const escp2_inkname_t stpi_escp2_default_black_inkset =
-{
-  "Gray", N_("Grayscale"), INKSET_CMYK,
-  &standard_black_channel_set
-};
-
-static const ink_channel_t *const standard_photo_black_channels[] =
-{
-  &standard_photo_black_channel
-};
-
-DECLARE_CHANNEL_SET(standard_photo_black);
-
-static const escp2_inkname_t stpi_escp2_default_photo_black_inkset =
-{
-  "Gray", N_("Grayscale"), INKSET_CMYK,
-  &standard_photo_black_channel_set
-};
-
-static const ink_channel_t *const standard_photo_gloss_black_channels[] =
-{
-  &f360_photo_black_channel, &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(standard_photo_gloss_black);
-DECLARE_AUX_CHANNEL_SET(standard_photo_black, standard_gloss);
-
-static const escp2_inkname_t stpi_escp2_default_photo_gloss_black_inkset =
-{
-  "GrayG", N_("Grayscale"), INKSET_CMYK,
-  &standard_photo_black_standard_gloss_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Two shade gray                                               *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo2_black_channels[] =
-{
-  &photo2_black_channel
-};
-
-DECLARE_CHANNEL_SET(photo2_black);
-
-static const escp2_inkname_t two_color_grayscale_inkset =
-{
-  "Gray2", N_("Two Level Grayscale"), INKSET_CcMmYKk,
-  &photo2_black_channel_set
-};
-
-static const ink_channel_t *const f360_photo2_black_channels[] =
-{
-  &f360_photo2_black_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo2_black);
-
-static const escp2_inkname_t f360_two_color_grayscale_inkset =
-{
-  "Gray2", N_("Two Level Grayscale"), INKSET_CcMmYKk,
-  &f360_photo2_black_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Three shade gray                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo3_black_channels[] =
-{
-  &photo3_black_channel
-};
-
-DECLARE_CHANNEL_SET(photo3_black);
-
-static const escp2_inkname_t three_color_grayscale_inkset =
-{
-  "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
-  &photo3_black_channel_set
-};
-
-static const ink_channel_t *const f360_photo3_black_channels[] =
-{
-  &f360_photo3_black_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo3_black);
-
-static const escp2_inkname_t f360_three_color_grayscale_inkset =
-{
-  "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
-  &f360_photo3_black_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Quadtone gray                                                *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const quadtone_channels[] =
-{
-  &quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(quadtone);
-
-static const escp2_inkname_t generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &quadtone_channel_set
-};
-
-static const ink_channel_t *const c80_quadtone_channels[] =
-{
-  &c80_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(c80_quadtone);
-
-static const escp2_inkname_t c80_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &c80_quadtone_channel_set
-};
-
-static const ink_channel_t *const c120_quadtone_channels[] =
-{
-  &c120_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(c120_quadtone);
-
-static const escp2_inkname_t c120_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &c120_quadtone_channel_set
-};
-
-static const ink_channel_t *const c64_quadtone_channels[] =
-{
-  &c64_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(c64_quadtone);
-
-static const escp2_inkname_t c64_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &c64_quadtone_channel_set
-};
-
-static const ink_channel_t *const f360_quadtone_channels[] =
-{
-  &f360_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(f360_quadtone);
-
-static const escp2_inkname_t f360_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &f360_quadtone_channel_set
-};
-
-static const ink_channel_t *const cx3650_quadtone_channels[] =
-{
-  &cx3650_quadtone_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_quadtone);
-
-static const escp2_inkname_t cx3650_generic_quadtone_inkset =
-{
-  "Quadtone", N_("Quadtone"), INKSET_QUADTONE,
-  &cx3650_quadtone_channel_set
-};
-
-
-
-/*
- ****************************************************************
- *                                                              *
- * Three color CMY                                              *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const standard_cmy_channels[] =
-{
-  NULL, &standard_cyan_channel,
-  &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(standard_cmy);
-
-static const escp2_inkname_t three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &standard_cmy_channel_set
-};
-
-static const ink_channel_t *const x80_cmy_channels[] =
-{
-  NULL, &x80_cyan_channel,
-  &x80_magenta_channel, &x80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(x80_cmy);
-
-static const escp2_inkname_t x80_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &x80_cmy_channel_set
-};
-
-static const ink_channel_t *const c80_cmy_channels[] =
-{
-  NULL, &c80_cyan_channel,
-  &c80_magenta_channel, &c80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c80_cmy);
-
-static const escp2_inkname_t c80_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &c80_cmy_channel_set
-};
-
-static const ink_channel_t *const c120_cmy_channels[] =
-{
-  NULL, &c120_cyan_channel,
-  &c120_magenta_channel, &c120_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c120_cmy);
-
-static const escp2_inkname_t c120_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &c120_cmy_channel_set
-};
-
-static const ink_channel_t *const c64_cmy_channels[] =
-{
-  NULL, &c64_cyan_channel,
-  &c64_magenta_channel, &c64_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c64_cmy);
-
-static const escp2_inkname_t c64_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &c64_cmy_channel_set
-};
-
-static const ink_channel_t *const f360_cmy_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_cmy);
-
-static const escp2_inkname_t f360_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &f360_cmy_channel_set
-};
-
-static const ink_channel_t *const cx3650_cmy_channels[] =
-{
-  NULL, &cx3650_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_cmy);
-
-static const escp2_inkname_t cx3650_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &cx3650_cmy_channel_set
-};
-
-static const ink_channel_t *const standard_gloss_cmy_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(standard_gloss_cmy);
-
-static const ink_channel_t *const r800_cmy_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmy);
-DECLARE_AUX_CHANNEL_SET(r800_cmy, standard_gloss);
-
-static const escp2_inkname_t three_color_r800_gloss_inkset =
-{
-  "RGBG", N_("Three Color Composite"), INKSET_CMYK,
-  &r800_cmy_standard_gloss_channel_set
-};
-
-static const escp2_inkname_t three_color_r800_composite_inkset =
-{
-  "RGBG", N_("Three Color Composite"), INKSET_CMYK,
-  &r800_cmy_channel_set
-};
-
-static const ink_channel_t *const r2400_cmy_channels[] =
-{
-  NULL, &standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r2400_cmy);
-
-static const escp2_inkname_t three_color_r2400_composite_inkset =
-{
-  "CMY", N_("Three Color Composite"), INKSET_CMYK,
-  &r2400_cmy_channel_set
-};
-
-static const ink_channel_t *const claria_cmy_channels[] =
-{
-  NULL, &claria_cyan_channel,
-  &claria_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_cmy);
-
-static const escp2_inkname_t claria_three_color_composite_inkset =
-{
-  "RGB", N_("Three Color Composite"), INKSET_CMYK,
-  &claria_cmy_channel_set
-};
-
-/*
- ****************************************************************
- *                                                              *
- * Four color CMYK                                              *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const standard_cmyk_channels[] =
-{
-  &standard_black_channel, &standard_cyan_channel,
-  &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(standard_cmyk);
-
-static const escp2_inkname_t four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &standard_cmyk_channel_set
-};
-
-static const ink_channel_t *const photo_cmyk_channels[] =
-{
-  &standard_photo_black_channel, &standard_cyan_channel,
-  &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo_cmyk);
-
-static const escp2_inkname_t four_color_photo_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &photo_cmyk_channel_set
-};
-
-static const ink_channel_t *const r800_cmyk_channels[] =
-{
-  &standard_black_channel, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmyk);
-
-static const escp2_inkname_t four_color_r800_matte_inkset =
-{
-  "CMYKG", N_("Four Color Standard"), INKSET_CMYK,
-  &r800_cmyk_channel_set
-};
-
-static const ink_channel_t *const r2400_cmyk_channels[] =
-{
-  &f360_black_channel, &standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r2400_cmyk);
-
-static const escp2_inkname_t four_color_r2400_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &r2400_cmyk_channel_set
-};
-
-static const ink_channel_t *const photo_gloss_cmyk_channels[] =
-{
-  &f360_photo_black_channel, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(photo_gloss_cmyk);
-
-static const ink_channel_t *const r800_photo_cmyk_channels[] =
-{
-  &f360_photo_black_channel, &f360_standard_cyan_channel,
-  &standard_magenta_channel, &f360_standard_yellow_channel,
-};
-
-DECLARE_CHANNEL_SET(r800_photo_cmyk);
-DECLARE_AUX_CHANNEL_SET(r800_photo_cmyk, standard_gloss);
-
-static const escp2_inkname_t four_color_r800_photo_gloss_inkset =
-{
-  "CMYKG", N_("Four Color Standard"), INKSET_CMYK,
-  &r800_photo_cmyk_standard_gloss_channel_set
-};
-
-static const ink_channel_t *const x80_cmyk_channels[] =
-{
-  &x80_black_channel, &x80_cyan_channel,
-  &x80_magenta_channel, &x80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(x80_cmyk);
-
-static const escp2_inkname_t x80_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &x80_cmyk_channel_set
-};
-
-static const ink_channel_t *const c80_cmyk_channels[] =
-{
-  &c80_black_channel, &c80_cyan_channel,
-  &c80_magenta_channel, &c80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c80_cmyk);
-
-static const escp2_inkname_t c80_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &c80_cmyk_channel_set
-};
-
-static const ink_channel_t *const c120_cmyk_channels[] =
-{
-  &c120_black_channel, &c120_cyan_channel,
-  &c120_magenta_channel, &c120_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c120_cmyk);
-
-static const escp2_inkname_t c120_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &c120_cmyk_channel_set
-};
-
-static const ink_channel_t *const c64_cmyk_channels[] =
-{
-  &c64_black_channel, &c64_cyan_channel,
-  &c64_magenta_channel, &c64_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c64_cmyk);
-
-static const escp2_inkname_t c64_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &c64_cmyk_channel_set
-};
-
-static const ink_channel_t *const f360_cmyk_channels[] =
-{
-  &standard_black_channel, &f360_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_cmyk);
-
-static const escp2_inkname_t f360_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &f360_cmyk_channel_set
-};
-
-static const ink_channel_t *const cx3650_cmyk_channels[] =
-{
-  &standard_black_channel, &cx3650_standard_cyan_channel,
-  &f360_standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_cmyk);
-
-static const escp2_inkname_t cx3650_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &cx3650_cmyk_channel_set
-};
-
-static const ink_channel_t *const claria_cmyk_channels[] =
-{
-  &claria_black_channel, &claria_cyan_channel,
-  &claria_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_cmyk);
-
-static const escp2_inkname_t claria_four_color_standard_inkset =
-{
-  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
-  &claria_cmyk_channel_set
-};
-
-static const ink_channel_t *const four_color_picturemate_channels[] =
-{
-  &photo_black_channel, &picturemate_cyan_channel,
-  &picturemate_magenta_channel, &picturemate_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(four_color_picturemate);
-
-static const escp2_inkname_t four_color_picturemate_inkset =
-{
-  "CMYK", N_("Four Color Photo"), INKSET_CMYK,
-  &four_color_picturemate_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Five color CcMmY                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo_composite_channels[] =
-{
-  NULL, &photo_cyan_channel,
-  &photo_magenta_channel, &photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo_composite);
-
-static const escp2_inkname_t five_color_photo_composite_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &photo_composite_channel_set
-};
-
-static const ink_channel_t *const f360_photo_composite_channels[] =
-{
-  NULL, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo_composite);
-
-static const escp2_inkname_t f360_five_color_photo_composite_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &f360_photo_composite_channel_set
-};
-
-static const ink_channel_t *const five_color_photo3_channels[] =
-{
-  NULL, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_photo3);
-
-static const escp2_inkname_t five_color_photo3_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &five_color_photo3_channel_set
-};
-
-static const ink_channel_t *const claria_ccmmy_channels[] =
-{
-  NULL, &claria_photo_cyan_channel,
-  &claria_photo_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_ccmmy);
-
-static const escp2_inkname_t claria_five_color_photo_composite_inkset =
-{
-  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
-  &claria_ccmmy_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Six color CcMmYK                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo_channels[] =
-{
-  &photo_black_channel, &photo_cyan_channel,
-  &photo_magenta_channel, &photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo);
-
-static const escp2_inkname_t six_color_photo_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &photo_channel_set
-};
-
-static const ink_channel_t *const f360_photo_channels[] =
-{
-  &standard_black_channel, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo);
-
-static const escp2_inkname_t f360_six_color_photo_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &f360_photo_channel_set
-};
-
-static const ink_channel_t *const six_color_photo3_channels[] =
-{
-  &f360_black_channel, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_photo3);
-
-static const escp2_inkname_t six_color_photo3_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &six_color_photo3_channel_set
-};
-
-static const ink_channel_t *const claria_ccmmyk_channels[] =
-{
-  &claria_black_channel, &claria_photo_cyan_channel,
-  &claria_photo_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_ccmmyk);
-
-static const escp2_inkname_t claria_six_color_photo_inkset =
-{
-  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
-  &claria_ccmmyk_channel_set
-};
-
-/*
- ****************************************************************
- *                                                              *
- * Six color CcMmYy (Japan)                                     *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photoj_composite_channels[] =
-{
-  NULL, &photo_cyan_channel,
-  &photo_magenta_channel, &photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photoj_composite);
-
-static const escp2_inkname_t j_six_color_enhanced_composite_inkset =
-{
-  "PhotoEnhanceJ", N_("Six Color Enhanced Composite"), INKSET_CcMmYyK,
-  &photoj_composite_channel_set
-};
-
-static const ink_channel_t *const f360_photoj_composite_channels[] =
-{
-  NULL, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photoj_composite);
-
-static const escp2_inkname_t f360_j_six_color_enhanced_composite_inkset =
-{
-  "PhotoEnhanceJ", N_("Six Color Enhanced Composite"), INKSET_CcMmYyK,
-  &f360_photoj_composite_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Seven color CcMmYKk                                          *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo2_channels[] =
-{
-  &photo2_black_channel, &photo_cyan_channel,
-  &photo_magenta_channel, &photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo2);
-
-static const escp2_inkname_t seven_color_enhanced_inkset =
-{
-  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &photo2_channel_set
-};
-
-static const ink_channel_t *const f360_photo2_channels[] =
-{
-  &f360_photo2_black_channel, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photo2);
-
-static const escp2_inkname_t f360_seven_color_enhanced_inkset =
-{
-  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &f360_photo2_channel_set
-};
-
-static const ink_channel_t *const seven_color_photo3_channels[] =
-{
-  &f360_photo2_black_channel, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(seven_color_photo3);
-
-static const escp2_inkname_t seven_color_photo3_inkset =
-{
-  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &seven_color_photo3_channel_set
-};
-
-/*
- ****************************************************************
- *                                                              *
- * Seven color CcMmYyK (Japan)                                  *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photoj_channels[] =
-{
-  &photo_black_channel, &photo_cyan_channel,
-  &photo_magenta_channel, &photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photoj);
-
-static const escp2_inkname_t j_seven_color_enhanced_inkset =
-{
-  "Photo7J", N_("Seven Color Enhanced"), INKSET_CcMmYyK,
-  &photoj_channel_set
-};
-
-static const ink_channel_t *const f360_photoj_channels[] =
-{
-  &standard_black_channel, &f360_photo_cyan_channel,
-  &f360_photo_magenta_channel, &f360_photo2_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_photoj);
-
-static const escp2_inkname_t f360_j_seven_color_enhanced_inkset =
-{
-  "Photo7J", N_("Seven Color Photo"), INKSET_CcMmYKk,
-  &f360_photoj_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Eight color CcMmYKkk                                         *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const photo3_channels[] =
-{
-  &f360_photo3_black_channel, &f360x_photo_cyan_channel,
-  &f360_photo_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(photo3);
-
-static const escp2_inkname_t eight_color_enhanced_inkset =
-{
-  "PhotoCMYK8", N_("Eight Color Photo"), INKSET_CcMmYKk,
-  &photo3_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Five color CMYRB                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const five_color_r800_channels[] =
-{
-  NULL, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_r800);
-
-static const escp2_inkname_t five_color_r800_inkset =
-{
-  "CMYRB", N_("Five Color Photo Composite"), INKSET_CMYKRB,
-  &five_color_r800_channel_set
-};
-
-static const ink_channel_t *const five_color_r800_photo_channels[] =
-{
-  NULL, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_r800_photo);
-
-static const escp2_inkname_t five_color_r800_photo_inkset =
-{
-  "CMYRB", N_("Five Color Photo Composite"), INKSET_CMYKRB,
-  &five_color_r800_photo_channel_set
-};
-
-static const ink_channel_t *const five_color_r800_photo_gloss_channels[] =
-{
-  NULL, &f360_standard_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(five_color_r800_photo_gloss);
-DECLARE_AUX_CHANNEL_SET(five_color_r800_photo, standard_gloss);
-
-static const escp2_inkname_t five_color_r800_photo_gloss_inkset =
-{
-  "CMYRBG", N_("Five Color Photo Composite"), INKSET_CMYKRB,
-  &five_color_r800_photo_standard_gloss_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Six color CMYKRB                                             *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const six_color_r800_channels[] =
-{
-  &standard_black_channel, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_r800);
-
-static const escp2_inkname_t six_color_r800_inkset =
-{
-  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_r800_channel_set
-};
-
-static const ink_channel_t *const six_color_r800_photo_channels[] =
-{
-  &f360_photo_black_channel, &r800_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_r800_photo);
-
-static const escp2_inkname_t six_color_r800_photo_inkset =
-{
-  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_r800_photo_channel_set
-};
-
-static const ink_channel_t *const six_color_picturemate_channels[] =
-{
-  &photo_black_channel, &picturemate_cyan_channel,
-  &picturemate_magenta_channel, &picturemate_yellow_channel,
-  &picturemate_red_channel, &picturemate_blue_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_picturemate);
-
-static const escp2_inkname_t six_color_picturemate_inkset =
-{
-  "CMYKRB", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_picturemate_channel_set
-};
-
-static const ink_channel_t *const six_color_r800_photo_gloss_channels[] =
-{
-  &f360_photo_black_channel, &f360_standard_cyan_channel,
-  &r800_magenta_channel, &r800_yellow_channel,
-  &r800_red_channel, &r800_blue_channel,
-  &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(six_color_r800_photo_gloss);
-DECLARE_AUX_CHANNEL_SET(six_color_r800_photo, standard_gloss);
-
-static const escp2_inkname_t six_color_r800_photo_gloss_inkset =
-{
-  "CMYKRBG", N_("Six Color Photo"), INKSET_CMYKRB,
-  &six_color_r800_photo_standard_gloss_channel_set
-};
-
-
-/*
- ****************************************************************
- *                                                              *
- * Extended (raw)                                               *
- *                                                              *
- ****************************************************************
- */
-
-static const ink_channel_t *const one_color_extended_channels[] =
-{
-  &standard_black_channel
-};
-DECLARE_CHANNEL_SET(one_color_extended);
-
-static const escp2_inkname_t one_color_extended_inkset =
-{
-  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
-  &one_color_extended_channel_set
-};
-
-static const ink_channel_t *const c120_one_color_extended_channels[] =
+static void
+load_channel(stp_mxml_node_t *node, stp_mxml_node_t *root, ink_channel_t *icl)
 {
-  &c120_black_channel
-};
-DECLARE_CHANNEL_SET(c120_one_color_extended);
-
-static const escp2_inkname_t c120_one_color_extended_inkset =
-{
-  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
-  &c120_one_color_extended_channel_set
-};
-
-static const escp2_inkname_t one_color_photo_extended_inkset =
-{
-  "PhysicalBlack", N_("One Color Raw"), INKSET_EXTENDED,
-  &standard_photo_black_channel_set
-};
-
-static const escp2_inkname_t one_color_r800_photo_gloss_extended_inkset =
-{
-  "PhysicalBlackGloss", N_("One Color Raw Enhanced Gloss"), INKSET_EXTENDED,
-  &standard_photo_gloss_black_channel_set
-};
-
-
-static const ink_channel_t *const two_color_extended_channels[] =
-{
-  &photo_black_channel, &extended_black_channel
-};
-DECLARE_CHANNEL_SET(two_color_extended);
-
-static const escp2_inkname_t two_color_extended_inkset =
-{
-  "PhysicalBlack2", N_("Two Color Raw"), INKSET_EXTENDED,
-  &two_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_two_color_extended_channels[] =
-{
-  &standard_black_channel, &extended_black_channel
-};
-DECLARE_CHANNEL_SET(f360_two_color_extended);
-
-static const escp2_inkname_t f360_two_color_extended_inkset =
-{
-  "PhysicalBlack2", N_("Two Color Raw"), INKSET_EXTENDED,
-  &f360_two_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const standard_three_color_extended_channels[] =
-{
-  &standard_cyan_channel, &standard_magenta_channel, &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(standard_three_color_extended);
-
-static const escp2_inkname_t three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &standard_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const r800_cmy_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &standard_magenta_channel,
-  &f360_standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmy_extended);
-
-static const escp2_inkname_t three_color_r800_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &r800_cmy_extended_channel_set
-};
-
-static const ink_channel_t *const r800_cmy_gloss_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &standard_magenta_channel,
-  &f360_standard_yellow_channel, &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(r800_cmy_gloss_extended);
-
-static const escp2_inkname_t three_color_r800_gloss_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw Gloss"), INKSET_EXTENDED,
-  &r800_cmy_gloss_extended_channel_set
-};
-
-static const ink_channel_t *const x80_three_color_extended_channels[] =
-{
-  &x80_cyan_channel, &x80_magenta_channel, &x80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(x80_three_color_extended);
-
-static const escp2_inkname_t x80_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &x80_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const c80_three_color_extended_channels[] =
-{
-  &c80_cyan_channel, &c80_magenta_channel, &c80_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c80_three_color_extended);
-
-static const escp2_inkname_t c80_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &c80_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const c120_three_color_extended_channels[] =
-{
-  &c120_cyan_channel, &c120_magenta_channel, &c120_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c120_three_color_extended);
-
-static const escp2_inkname_t c120_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &c120_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const c64_three_color_extended_channels[] =
-{
-  &c64_cyan_channel, &c64_magenta_channel, &c64_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(c64_three_color_extended);
-
-static const escp2_inkname_t c64_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &c64_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_three_color_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &f360_standard_magenta_channel,
-  &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(f360_three_color_extended);
-
-static const escp2_inkname_t f360_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &f360_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const cx3650_three_color_extended_channels[] =
-{
-  &cx3650_standard_cyan_channel, &f360_standard_magenta_channel,
-  &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(cx3650_three_color_extended);
-
-static const escp2_inkname_t cx3650_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &cx3650_three_color_extended_channel_set
-};
-
-static const ink_channel_t *const claria_three_color_extended_channels[] =
-{
-  &claria_cyan_channel, &claria_magenta_channel, &claria_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(claria_three_color_extended);
-
-static const escp2_inkname_t claria_three_color_extended_inkset =
-{
-  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
-  &claria_three_color_extended_channel_set
-};
-
-
-static const escp2_inkname_t four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &standard_cmyk_channel_set
-};
-
-static const escp2_inkname_t four_color_photo_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &photo_cmyk_channel_set
-};
-
-static const escp2_inkname_t x80_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &x80_cmyk_channel_set
-};
-
-static const escp2_inkname_t c80_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &c80_cmyk_channel_set
-};
-
-static const escp2_inkname_t c120_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &c120_cmyk_channel_set
-};
-
-static const escp2_inkname_t c64_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &c64_cmyk_channel_set
-};
-
-static const escp2_inkname_t f360_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &f360_cmyk_channel_set
-};
-
-static const escp2_inkname_t cx3650_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &cx3650_cmyk_channel_set
-};
-
-static const escp2_inkname_t claria_four_color_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &claria_cmyk_channel_set
-};
-
-static const escp2_inkname_t four_color_picturemate_extended_inkset =
-{
-  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
-  &four_color_picturemate_channel_set
-};
-
-static const escp2_inkname_t four_color_r800_extended_inkset =
-{
-  "PhysicalCMYKGloss", N_("Four Color Raw"), INKSET_EXTENDED,
-  &r800_cmyk_channel_set
-};
-
-static const escp2_inkname_t four_color_r800_photo_gloss_extended_inkset =
-{
-  "PhysicalCMYKGloss", N_("Four Color Raw Gloss"), INKSET_EXTENDED,
-  &photo_gloss_cmyk_channel_set
-};
-
-
-static const ink_channel_t *const five_color_extended_channels[] =
-{
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(five_color_extended);
-
-static const escp2_inkname_t five_color_extended_inkset =
-{
-  "PhysicalCcMmY", N_("Five Color Raw"), INKSET_EXTENDED,
-  &five_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_five_color_extended_channels[] =
-{
-  &f360_standard_cyan_channel, &extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &f360_photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(f360_five_color_extended);
-
-static const escp2_inkname_t f360_five_color_extended_inkset =
-{
-  "PhysicalCcMmY", N_("Five Color Raw"), INKSET_EXTENDED,
-  &f360_five_color_extended_channel_set
-};
-
-static const ink_channel_t *const claria_five_color_extended_channels[] =
-{
-  &claria_cyan_channel, &extended_claria_cyan_channel,
-  &claria_magenta_channel, &extended_claria_magenta_channel,
-  &claria_yellow_channel
-};
-DECLARE_CHANNEL_SET(claria_five_color_extended);
-
-static const escp2_inkname_t claria_five_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &claria_five_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const six_color_extended_channels[] =
-{
-  &photo_black_channel,
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(six_color_extended);
-
-static const escp2_inkname_t six_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &six_color_extended_channel_set
-};
-
-static const escp2_inkname_t six_color_r800_extended_inkset =
-{
-  "PhysicalCMYKRB", N_("Six Color Raw"), INKSET_EXTENDED,
-  &six_color_r800_channel_set
-};
-
-static const escp2_inkname_t six_color_picturemate_extended_inkset =
-{
-  "PhysicalCMYKRB", N_("Six Color Raw"), INKSET_EXTENDED,
-  &six_color_picturemate_channel_set
-};
-
-static const ink_channel_t *const f360_six_color_extended_channels[] =
-{
-  &standard_black_channel,
-  &f360_standard_cyan_channel, &extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &f360_photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(f360_six_color_extended);
-
-static const escp2_inkname_t f360_six_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &f360_six_color_extended_channel_set
-};
-
-static const escp2_inkname_t six_color_r800_photo_gloss_extended_inkset =
-{
-  "PhysicalCMYKRB", N_("Six Color Enhanced Gloss Raw"), INKSET_EXTENDED,
-  &six_color_r800_photo_gloss_channel_set
-};
-
-static const ink_channel_t *const claria_six_color_extended_channels[] =
-{
-  &claria_black_channel,
-  &claria_cyan_channel, &extended_claria_cyan_channel,
-  &claria_magenta_channel, &extended_claria_magenta_channel,
-  &claria_yellow_channel
-};
-DECLARE_CHANNEL_SET(claria_six_color_extended);
-
-static const escp2_inkname_t claria_six_color_extended_inkset =
-{
-  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
-  &claria_six_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const j_seven_color_extended_channels[] =
-{
-  &photo_black_channel,
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel, &j_extended_yellow_channel
-};
-DECLARE_CHANNEL_SET(j_seven_color_extended);
-
-static const escp2_inkname_t j_seven_color_extended_inkset =
-{
-  "PhysicalCcMmYyK", N_("Seven Color Raw"), INKSET_EXTENDED,
-  &j_seven_color_extended_channel_set
-};
-
-static const ink_channel_t *const seven_color_extended_channels[] =
-{
-  &photo_black_channel, &extended_black_channel,
-  &standard_cyan_channel, &extended_cyan_channel,
-  &standard_magenta_channel, &extended_magenta_channel,
-  &photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(seven_color_extended);
-
-static const escp2_inkname_t seven_color_extended_inkset =
-{
-  "PhysicalCcMmYKk", N_("Seven Color Raw"), INKSET_EXTENDED,
-  &seven_color_extended_channel_set
-};
-
-static const ink_channel_t *const f360_seven_color_extended_channels[] =
-{
-  &standard_black_channel, &extended_black_channel,
-  &f360_standard_cyan_channel, &extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &f360_photo_yellow_channel
-};
-DECLARE_CHANNEL_SET(f360_seven_color_extended);
-
-static const escp2_inkname_t f360_seven_color_extended_inkset =
-{
-  "PhysicalCcMmYKk", N_("Seven Color Raw"), INKSET_EXTENDED,
-  &f360_seven_color_extended_channel_set
-};
-
-
-static const ink_channel_t *const seven_color_r800_gloss_extended_channels[] =
-{
-  &standard_black_channel, &f360_photo_black_channel,
-  &r800_cyan_channel, &r800_magenta_channel,
-  &r800_yellow_channel, &r800_red_channel,
-  &r800_blue_channel, &standard_gloss_channel
-};
-
-DECLARE_CHANNEL_SET(seven_color_r800_gloss_extended);
-
-static const escp2_inkname_t seven_color_r800_gloss_extended_inkset =
-{
-  "PhysicalCMYKPRB", N_("Seven Color Enhanced Gloss Raw"), INKSET_EXTENDED,
-  &seven_color_r800_gloss_extended_channel_set
-};
-
-
-static const ink_channel_t *const eight_color_extended_channels[] =
-{
-  &f360_black_channel, &extended_black_channel,
-  &f360_extended_photo3_black_channel,
-  &standard_cyan_channel, &f360_extended_cyan_channel,
-  &f360_standard_magenta_channel, &extended_magenta_channel,
-  &standard_yellow_channel
-};
-
-DECLARE_CHANNEL_SET(eight_color_extended);
-
-static const escp2_inkname_t eight_color_extended_inkset =
-{
-  "PhysicalCMYKkk", N_("Eight Color Raw"), INKSET_EXTENDED,
-  &eight_color_extended_channel_set
-};
-
-
-static const shade_set_t standard_shades =
-{
-  { 1, { 1.0 }},		/* K */
-  { 1, { 1.0 }},		/* C */
-  { 1, { 1.0 }},		/* M */
-  { 1, { 1.0 }},		/* Y */
-  { 1, { 1.0 }},		/* Extended 5 */
-  { 1, { 1.0 }},		/* Extended 6 */
-  { 1, { 1.0 }},		/* Extended 7 */
-  { 1, { 1.0 }},		/* Extended 8 */
-};
-
-static const shade_set_t photo_gen1_shades =	/* Stylus 750 and older */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.305 }},
-  { 2, { 1.0, 0.315 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t photo_gen2_shades =	/* Stylus 870 and newer */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.29 }},
-  { 2, { 1.0, 0.29 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t photo_gen3_shades =	/* Stylus R300 and newer */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.35 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t esp960_shades =	/* Epson 950/960/PM-950C/PM-970C */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.316 }},
-  { 2, { 1.0, 0.34 }},
-  { 2, { 1.0, 0.5 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t stp2000_shades =	/* Stylus Photo 2000 */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.227 }},		/* Just a guess */
-  { 2, { 1.0, 0.227 }},		/* Just a guess */
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultrachrome_photo_shades =	/* Ultrachrome with photo black ink */
-{
-  { 2, { 1.0, 0.48 }},
-  { 2, { 1.0, 0.33 }},
-  { 2, { 1.0, 0.25 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultrachrome_matte_shades =	/* Ultrachrome with matte black ink */
-{
-  { 2, { 1.0, 0.33 }},
-  { 2, { 1.0, 0.33 }},
-  { 2, { 1.0, 0.25 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultra3_photo_shades =	/* R2400 with photo black ink */
-{
-  { 3, { 1.0, 0.48, 0.16 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.20 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t ultra3_matte_shades =	/* R2400 with matte black ink */
-{
-  { 3, { 1.0, 0.278, 0.093 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.20 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t quadtone_shades =	/* Some kind of quadtone ink */
-{
-  { 4, { 1.0, 0.75, 0.5, 0.25 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-static const shade_set_t claria_shades =	/* Stylus R260 and newer */
-{
-  { 1, { 1.0 }},
-  { 2, { 1.0, 0.35 }},
-  { 2, { 1.0, 0.33 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-  { 1, { 1.0 }},
-};
-
-#define DECLARE_INKLIST(tname, name, inks, text, papers, adjustments, shades) \
-static const inklist_t name##_inklist =					      \
-{									      \
-  tname,								      \
-  text,									      \
-  inks##_ink_types,							      \
-  #papers,								      \
-  #adjustments,								      \
-  &shades##_shades,							      \
-  sizeof(inks##_ink_types) / sizeof(escp2_inkname_t *),			      \
+  const char *name;
+  stp_mxml_node_t *child = node->child;
+  int count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "subchannel"))
+	count++;
+      child = child->next;
+    }
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    icl->name = stp_strdup(name);
+  icl->n_subchannels = count;
+  icl->subchannels = stp_zalloc(sizeof(physical_subchannel_t) * count);
+  count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "subchannel"))
+	    load_subchannel(child, root, &(icl->subchannels[count++]));
+	  else if (!strcmp(child->value.element.name, "HueCurve"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      stp_curve_t *curve;
+	      const char *cref = stp_mxmlElementGetAttr(child, "ref");
+	      if (cref)
+		{
+		  cchild = stp_mxmlFindElement(root, root, "curve", "name",
+					       cref, STP_MXML_DESCEND);
+		  if (!cchild)
+		    {
+		      stp_erprintf("Cannot find curve named '%s'!\n", cref);
+		      stp_abort();
+		    }
+		}
+	      else
+		{
+		  while (cchild && cchild->type != STP_MXML_ELEMENT)
+		    cchild = cchild->next;
+		  if (!cchild)
+		    {
+		      stp_erprintf("Cannot find curve!\n");
+		      stp_abort();
+		    }
+		}
+	      curve = stp_curve_create_from_xmltree(cchild);
+	      icl->hue_curve = curve;
+	    }
+	  else if (!strcmp(child->value.element.name, "HueCurveParam"))
+	    {
+	      name = stp_mxmlElementGetAttr(child, "name");
+	      if (name)
+		icl->hue_curve_name = stp_strdup(name);
+	    }
+	}
+      child = child->next;
+    }
 }
 
-
-static const escp2_inkname_t *const cmy_ink_types[] =
-{
-  &three_color_composite_inkset
-};
-
-DECLARE_INKLIST("None", cmy, cmy, N_("EPSON Standard Inks"),
-		standard, standard, standard);
-
-
-static const escp2_inkname_t *const standard_ink_types[] =
-{
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", standard, standard, N_("EPSON Standard Inks"),
-		standard, standard, standard);
-DECLARE_INKLIST("None", photo_gen3_4, standard, N_("EPSON Standard Inks"),
-		standard, photo3, standard);
-
-static const escp2_inkname_t *const quadtone_ink_types[] =
+static void
+load_inkname(stp_mxml_node_t *node, stp_mxml_node_t *root, inkname_t *inl)
 {
-  &generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("quadtone", quadtone, quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const c80_ink_types[] =
-{
-  &c80_four_color_standard_inkset,
-  &c80_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &c80_three_color_extended_inkset,
-  &c80_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", c80, c80, N_("EPSON Standard Inks"),
-		durabrite, durabrite, standard);
-
-DECLARE_INKLIST("None", c82, c80, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const c80_quadtone_ink_types[] =
-{
-  &c80_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", c80_quadtone, c80_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const c120_ink_types[] =
-{
-  &c120_four_color_standard_inkset,
-  &c120_three_color_composite_inkset,
-  &c120_one_color_extended_inkset,
-  &c120_three_color_extended_inkset,
-  &c120_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", c120, c120, N_("EPSON Standard Inks"),
-		durabrite2, durabrite3, standard);
-
-static const escp2_inkname_t *const c120_quadtone_ink_types[] =
-{
-  &c120_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", c120_quadtone, c120_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const c64_ink_types[] =
-{
-  &c64_four_color_standard_inkset,
-  &c64_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &c64_three_color_extended_inkset,
-  &c64_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", c64, c64, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const c64_quadtone_ink_types[] =
-{
-  &c64_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", c64_quadtone, c64_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const f360_ink_types[] =
-{
-  &f360_four_color_standard_inkset,
-  &f360_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &f360_three_color_extended_inkset,
-  &f360_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", f360, f360, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const f360_quadtone_ink_types[] =
-{
-  &f360_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", f360_quadtone, f360_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const cx3650_ink_types[] =
-{
-  &cx3650_four_color_standard_inkset,
-  &cx3650_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &cx3650_three_color_extended_inkset,
-  &cx3650_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", cx3650, cx3650, N_("EPSON Standard Inks"),
-		durabrite2, durabrite2, standard);
-
-static const escp2_inkname_t *const cx3650_quadtone_ink_types[] =
-{
-  &cx3650_generic_quadtone_inkset,
-};
-
-DECLARE_INKLIST("Quadtone", cx3650_quadtone, cx3650_quadtone, N_("Quadtone"),
-		standard, standard, quadtone);
-
-static const escp2_inkname_t *const x80_ink_types[] =
-{
-  &x80_four_color_standard_inkset,
-  &x80_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &x80_three_color_extended_inkset,
-  &x80_four_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", x80, x80, N_("EPSON Standard Inks"),
-		standard, standard, standard);
-
-static const escp2_inkname_t *const photo_ink_types[] =
-{
-  &six_color_photo_inkset,
-  &five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &five_color_extended_inkset,
-  &six_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", gen1, photo, N_("EPSON Standard Inks"),
-		standard, photo, photo_gen1);
-DECLARE_INKLIST("None", photo_gen2, photo, N_("EPSON Standard Inks"),
-		standard, photo2, photo_gen2);
-DECLARE_INKLIST("None", photo_gen3, photo, N_("EPSON Standard Inks"),
-		standard, photo3, photo_gen3);
-DECLARE_INKLIST("None", pigment, photo, N_("EPSON Standard Inks"),
-		ultrachrome, ultrachrome_photo, stp2000);
-
-static const escp2_inkname_t *const f360_photo_ink_types[] =
-{
-  &f360_six_color_photo_inkset,
-  &f360_five_color_photo_composite_inkset,
-  &f360_four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &f360_four_color_extended_inkset,
-  &f360_five_color_extended_inkset,
-  &f360_six_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", f360_photo, f360_photo, N_("EPSON Standard Inks"),
-		standard, sp960, esp960);
-
-static const escp2_inkname_t *const claria_ink_types[] =
-{
-  &claria_six_color_photo_inkset,
-  &claria_five_color_photo_composite_inkset,
-  &claria_four_color_standard_inkset,
-  &claria_three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &claria_three_color_extended_inkset,
-  &claria_four_color_extended_inkset,
-  &claria_five_color_extended_inkset,
-  &claria_six_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", claria, claria, N_("EPSON Standard Inks"),
-		standard, claria, claria);
-
-static const escp2_inkname_t *const f360_photo7_japan_ink_types[] =
-{
-  &f360_j_seven_color_enhanced_inkset,
-  &f360_j_six_color_enhanced_composite_inkset,
-  &f360_six_color_photo_inkset,
-  &f360_five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &f360_five_color_extended_inkset,
-  &f360_six_color_extended_inkset,
-  &f360_seven_color_extended_inkset,
-};
-
-DECLARE_INKLIST("None", f360_photo7_japan, f360_photo7_japan,
-		N_("EPSON Standard Inks"), standard, sp960, esp960);
-
-static const escp2_inkname_t *const f360_photo7_ink_types[] =
-{
-  &f360_seven_color_enhanced_inkset,
-  &f360_six_color_photo_inkset,
-  &f360_five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &f360_two_color_grayscale_inkset,
-  &one_color_extended_inkset,
-  &f360_two_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &f360_five_color_extended_inkset,
-  &f360_six_color_extended_inkset,
-  &f360_seven_color_extended_inkset,
-};
-
-DECLARE_INKLIST("ultraphoto", f360_ultra_photo7, f360_photo7,
-		N_("UltraChrome Photo Black"), ultrachrome,
-		ultrachrome_photo, ultrachrome_photo);
-
-DECLARE_INKLIST("ultramatte", f360_ultra_matte7, f360_photo7,
-		N_("UltraChrome Matte Black"), ultrachrome,
-		ultrachrome_matte, ultrachrome_matte);
-
-static const escp2_inkname_t *const photo7_ink_types[] =
-{
-  &seven_color_enhanced_inkset,
-  &six_color_photo_inkset,
-  &five_color_photo_composite_inkset,
-  &four_color_standard_inkset,
-  &three_color_composite_inkset,
-  &two_color_grayscale_inkset,
-  &one_color_extended_inkset,
-  &two_color_extended_inkset,
-  &three_color_extended_inkset,
-  &four_color_extended_inkset,
-  &five_color_extended_inkset,
-  &six_color_extended_inkset,
-  &seven_color_extended_inkset,
-};
-
-DECLARE_INKLIST("ultraphoto", ultra_photo7, photo7,
-		N_("UltraChrome Photo Black"), ultrachrome,
-		ultrachrome_photo, ultrachrome_photo);
-
-DECLARE_INKLIST("ultramatte", ultra_matte7, photo7,
-		N_("UltraChrome Matte Black"), ultrachrome,
-		ultrachrome_matte, ultrachrome_matte);
-
-static const escp2_inkname_t *const f360_photo8_ink_types[] =
-{
-  &eight_color_enhanced_inkset,
-  &seven_color_photo3_inkset,
-  &six_color_photo3_inkset,
-  &five_color_photo3_inkset,
-  &four_color_r2400_standard_inkset,
-  &three_color_r2400_composite_inkset,
-  &eight_color_extended_inkset,
-};
-
-DECLARE_INKLIST("ultra3photo", f360_ultra_photo8, f360_photo8,
-		N_("Photo Black"), ultrachrome_k3,
-		ultrachrome_k3_photo, ultra3_photo);
-
-DECLARE_INKLIST("ultra3matte", f360_ultra_matte8, f360_photo8,
-		N_("Matte Black"), ultrachrome_k3,
-		ultrachrome_k3_matte, ultra3_matte);
-
-static const escp2_inkname_t *const cmykrb_matte_ink_types[] =
-{
-  &six_color_r800_inkset,
-  &five_color_r800_inkset,
-  &four_color_r800_matte_inkset,
-  &three_color_r800_composite_inkset,
-  &one_color_extended_inkset,
-  &three_color_r800_extended_inkset,
-  &four_color_r800_extended_inkset,
-  &six_color_r800_extended_inkset,
-};
-
-DECLARE_INKLIST("cmykrbmatte", cmykrb_matte, cmykrb_matte,
-		N_("Matte Black"), r800, r800_matte, standard);
-
-static const escp2_inkname_t *const cmykrb_photo_ink_types[] =
-{
-  &six_color_r800_photo_gloss_inkset,
-  &five_color_r800_photo_gloss_inkset,
-  &four_color_r800_photo_gloss_inkset,
-  &three_color_r800_gloss_inkset,
-  &one_color_extended_inkset,
-  &one_color_r800_photo_gloss_extended_inkset,
-  &three_color_r800_extended_inkset,
-  &three_color_r800_gloss_extended_inkset,
-  &four_color_r800_photo_gloss_extended_inkset,
-  &six_color_r800_photo_gloss_extended_inkset,
-  &seven_color_r800_gloss_extended_inkset
-};
-
-DECLARE_INKLIST("cmykrbphoto", cmykrb_photo, cmykrb_photo,
-		N_("Photo Black"), r800, r800_photo, standard);
-
-static const escp2_inkname_t *const picturemate_6_photo_ink_types[] =
-{
-  &six_color_picturemate_inkset,
-  &four_color_picturemate_inkset,
-  &six_color_picturemate_extended_inkset,
-  &four_color_picturemate_extended_inkset,
-};
-
-DECLARE_INKLIST("picturemate_6", picturemate_6, picturemate_6_photo,
-		N_("Standard"), picturemate, picturemate_6, standard);
-
-static const escp2_inkname_t *const picturemate_4_photo_ink_types[] =
-{
-  &four_color_picturemate_inkset,
-  &four_color_picturemate_extended_inkset,
-};
-
-DECLARE_INKLIST("picturemate_4", picturemate_4, picturemate_4_photo,
-		N_("Standard"), picturemate, picturemate_4, standard);
-
-
-#define DECLARE_INKGROUP(name)			\
-static const inkgroup_t name##_inkgroup =	\
-{						\
-  #name,					\
-  name##_group,					\
-  sizeof(name##_group) / sizeof(inklist_t *),	\
+  const char *name;
+  stp_mxml_node_t *child = node->child;
+  int channel_count = 0;
+  int aux_channel_count = 0;
+
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "Channels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  if (idx + 1 > channel_count)
+			    channel_count = idx + 1;
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	  else if (!strcmp(child->value.element.name, "AuxChannels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  if (idx + 1 > aux_channel_count)
+			    aux_channel_count = idx + 1;
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	}
+      child = child->next;
+    }
+  inl->channel_count = channel_count;
+  if (channel_count > 0)
+    inl->channels = stp_zalloc(sizeof(ink_channel_t) * channel_count);
+  inl->aux_channel_count = aux_channel_count;
+  if (aux_channel_count > 0)
+    inl->aux_channels = stp_zalloc(sizeof(ink_channel_t) * aux_channel_count);
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    inl->name = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "text");
+  if (name)
+    inl->text = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "InkID");
+  if (name)
+    {
+      if (!strcmp(name, "CMYK"))
+	inl->inkset = INKSET_CMYK;
+      else if (!strcmp(name, "CcMmYK"))
+	inl->inkset = INKSET_CcMmYK;
+      else if (!strcmp(name, "CcMmYyK"))
+	inl->inkset = INKSET_CcMmYyK;
+      else if (!strcmp(name, "CcMmYKk"))
+	inl->inkset = INKSET_CcMmYKk;
+      else if (!strcmp(name, "Quadtone"))
+	inl->inkset = INKSET_QUADTONE;
+      else if (!strcmp(name, "OTHER"))
+	inl->inkset = INKSET_OTHER;
+      else if (!strcmp(name, "Extended"))
+	inl->inkset = INKSET_EXTENDED;
+    }
+
+  channel_count = 0;
+  aux_channel_count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "Channels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  load_channel(cchild, root, &(inl->channels[idx]));
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	  else if (!strcmp(child->value.element.name, "AuxChannels"))
+	    {
+	      stp_mxml_node_t *cchild = child->child;
+	      while (cchild)
+		{
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      !strcmp(cchild->value.element.name, "channel"))
+		    {
+		      name = stp_mxmlElementGetAttr(cchild, "index");
+		      if (name)
+			{
+			  unsigned idx = stp_xmlstrtoul(name);
+			  load_channel(cchild, root, &(inl->aux_channels[idx]));
+			}
+		    }
+		  cchild = cchild->next;
+		}
+	    }
+	}
+      child = child->next;
+    }
 }
 
-static const inklist_t *const cmy_group[] =
-{
-  &cmy_inklist
-};
-
-DECLARE_INKGROUP(cmy);
-
-static const inklist_t *const standard_group[] =
-{
-  &standard_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(standard);
-
-static const inklist_t *const c80_group[] =
-{
-  &c80_inklist,
-  &c80_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c80);
-
-static const inklist_t *const c120_group[] =
-{
-  &c120_inklist,
-  &c120_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c120);
-
-static const inklist_t *const c82_group[] =
-{
-  &c82_inklist,
-  &c80_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c82);
-
-static const inklist_t *const c64_group[] =
-{
-  &c64_inklist,
-  &c64_quadtone_inklist
-};
-
-DECLARE_INKGROUP(c64);
-
-static const inklist_t *const f360_group[] =
-{
-  &f360_inklist,
-  &f360_quadtone_inklist
-};
-
-DECLARE_INKGROUP(f360);
-
-static const inklist_t *const cx3650_group[] =
-{
-  &cx3650_inklist,
-  &cx3650_quadtone_inklist
-};
-
-DECLARE_INKGROUP(cx3650);
-
-static const inklist_t *const x80_group[] =
-{
-  &x80_inklist
-};
-
-DECLARE_INKGROUP(x80);
-
-static const inklist_t *const photo_gen1_group[] =
-{
-  &gen1_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen1);
-
-static const inklist_t *const photo_gen2_group[] =
-{
-  &photo_gen2_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen2);
-
-static const inklist_t *const photo_gen3_group[] =
-{
-  &photo_gen3_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen3);
-
-static const inklist_t *const photo_gen3_4_group[] =
-{
-  &photo_gen3_4_inklist,
-  &quadtone_inklist
-};
-
-DECLARE_INKGROUP(photo_gen3_4);
-
-static const inklist_t *const photo_pigment_group[] =
-{
-  &pigment_inklist
-};
-
-DECLARE_INKGROUP(photo_pigment);
-
-static const inklist_t *const f360_photo_group[] =
-{
-  &f360_photo_inklist
-};
-
-DECLARE_INKGROUP(f360_photo);
-
-static const inklist_t *const f360_photo7_japan_group[] =
-{
-  &f360_photo7_japan_inklist
-};
-
-DECLARE_INKGROUP(f360_photo7_japan);
-
-static const inklist_t *const f360_ultrachrome_group[] =
-{
-  &f360_ultra_photo7_inklist,
-  &f360_ultra_matte7_inklist
-};
-
-DECLARE_INKGROUP(f360_ultrachrome);
-
-static const inklist_t *const ultrachrome_group[] =
-{
-  &ultra_photo7_inklist,
-  &ultra_matte7_inklist
-};
-
-DECLARE_INKGROUP(ultrachrome);
-
-static const inklist_t *const f360_ultrachrome_k3_group[] =
-{
-  &f360_ultra_photo8_inklist,
-  &f360_ultra_matte8_inklist
-};
-
-DECLARE_INKGROUP(f360_ultrachrome_k3);
-
-static const inklist_t *const cmykrb_group[] =
-{
-  &cmykrb_photo_inklist,
-  &cmykrb_matte_inklist
-};
-
-DECLARE_INKGROUP(cmykrb);
-
-static const inklist_t *const picturemate_4_group[] =
-{
-  &picturemate_4_inklist,
-};
-
-DECLARE_INKGROUP(picturemate_4);
-
-static const inklist_t *const picturemate_6_group[] =
-{
-  &picturemate_6_inklist,
-};
-
-DECLARE_INKGROUP(picturemate_6);
-
-static const inklist_t *const claria_group[] =
-{
-  &claria_inklist,
-};
-
-DECLARE_INKGROUP(claria);
+static void
+load_shades(stp_mxml_node_t *node, stp_mxml_node_t *root, inklist_t *ikl)
+{
+  stp_mxml_node_t *child = node->child;
+  int count = 0;
+
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "shade"))
+	count++;
+      child = child->next;
+    }
+  ikl->n_shades = count;
+  ikl->shades = stp_zalloc(sizeof(shade_t) * count);
+  count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "shade"))
+	{
+	  if (stp_mxmlElementGetAttr(child, "count"))
+	    {
+	      unsigned nshades =
+		stp_xmlstrtoul(stp_mxmlElementGetAttr(child, "count"));
+	      ikl->shades[count].n_shades = nshades;
+	      if (nshades > 0)
+		{
+		  char *endptr;
+		  stp_mxml_node_t *cchild = child->child;
+		  ikl->shades[count].shades = stp_zalloc(sizeof(double) * nshades);
+		  nshades = 0;
+		  while (cchild && nshades < ikl->shades[count].n_shades)
+		    {
+		      if (cchild->type == STP_MXML_TEXT)
+			{
+			  double val =
+			    strtod(cchild->value.text.string, &endptr);
+			  if (endptr)
+			    ikl->shades[count].shades[nshades++] = val;
+			}
+		      cchild = cchild->next;
+		    }
+		}
+	    }
+	  count++;
+	}
+      child = child->next;
+    }
+}
 
-typedef struct
+static void
+load_inklist(stp_mxml_node_t *node, stp_mxml_node_t *root, inklist_t *ikl)
 {
   const char *name;
-  const inkgroup_t *inkgroup;
-} ink_t;
-
-static const ink_t the_inks[] =
-{
-  { "cmy", &cmy_inkgroup },
-  { "standard", &standard_inkgroup },
-  { "c120", &c120_inkgroup },
-  { "c80", &c80_inkgroup },
-  { "c82", &c82_inkgroup },
-  { "c64", &c64_inkgroup },
-  { "f360", &f360_inkgroup },
-  { "cx3650", &cx3650_inkgroup },
-  { "x80", &x80_inkgroup },
-  { "photo_gen1", &photo_gen1_inkgroup },
-  { "photo_gen2", &photo_gen2_inkgroup },
-  { "photo_gen3", &photo_gen3_inkgroup },
-  { "photo_gen3_4", &photo_gen3_4_inkgroup },
-  { "photo_pigment", &photo_pigment_inkgroup },
-  { "ultrachrome", &ultrachrome_inkgroup },
-  { "f360_photo", &f360_photo_inkgroup },
-  { "f360_photo7_japan", &f360_photo7_japan_inkgroup },
-  { "f360_ultrachrome", &f360_ultrachrome_inkgroup },
-  { "f360_ultrachrome_k3", &f360_ultrachrome_k3_inkgroup },
-  { "cmykrb", &cmykrb_inkgroup },
-  { "picturemate_6", &picturemate_6_inkgroup },
-  { "picturemate_4", &picturemate_4_inkgroup },
-  { "claria", &claria_inkgroup },
-};
-
-const inkgroup_t *
-stpi_escp2_get_inkgroup_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_inks) / sizeof(ink_t); i++)
-      {
-	if (strcmp(n, the_inks[i].name) == 0)
-	  return the_inks[i].inkgroup;
-      }
-  return NULL;
+  stp_mxml_node_t *child = node->child;
+  int count = 0;
+
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "InkName"))
+	count++;
+      child = child->next;
+    }
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    ikl->name = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "text");
+  if (name)
+    ikl->text = stp_strdup(name);
+  ikl->n_inks = count;
+  ikl->inknames = stp_zalloc(sizeof(inkname_t) * count);
+  count = 0;
+  child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT)
+	{
+	  if (!strcmp(child->value.element.name, "InkName"))
+	    load_inkname(child, root, &(ikl->inknames[count++]));
+	  else if (!strcmp(child->value.element.name, "Shades"))
+	    load_shades(child, root, ikl);
+	}
+      child = child->next;
+    }
 }
 
-const escp2_inkname_t *
-stpi_escp2_get_default_black_inkset(void)
-{
-  return &stpi_escp2_default_black_inkset;
+static inkgroup_t *
+load_inkgroup(const char *name)
+{
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  inkgroup_t *igl = NULL;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *inkgroup =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (inkgroup)
+	{
+	  int count = 0;
+	  stp_mxml_node_t *node = stp_mxmlFindElement(inkgroup, inkgroup,
+						      "escp2:InkGroup", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    {
+	      stp_mxml_node_t *child = node->child;
+	      igl = stp_zalloc(sizeof(inkgroup_t));
+	      while (child)
+		{
+		  if (child->type == STP_MXML_ELEMENT &&
+		      !strcmp(child->value.element.name, "InkList"))
+		    count++;
+		  child = child->next;
+		}
+	      igl->n_inklists = count;
+	      if (stp_mxmlElementGetAttr(node, "name"))
+		igl->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+	      else
+		igl->name = stp_strdup(name);
+	      igl->inklists = stp_zalloc(sizeof(inklist_t) * count);
+	      child = node->child;
+	      count = 0;
+	      while (child)
+		{
+		  if (child->type == STP_MXML_ELEMENT &&
+		      !strcmp(child->value.element.name, "InkList"))
+		    load_inklist(child, node, &(igl->inklists[count++]));
+		  child = child->next;
+		}
+	    }
+	  stp_mxmlDelete(inkgroup);
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  return igl;
 }
 
-
-#define DECLARE_CHANNEL_LIST(name)			\
-static const channel_name_t name##_channel_name_list =	\
-{							\
-  #name,						\
-  sizeof(name##_channel_names) / sizeof(const char *),	\
-  name##_channel_names					\
+int
+stp_escp2_load_inkgroup(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  inkgroup_t *igl = load_inkgroup(name);
+  if (igl)
+    printdef->inkgroup = igl;
+  else
+    {
+      stp_erprintf("Unable to load ink definitions from %s!\n", name);
+      stp_abort();
+    }
+  return (igl != NULL);
 }
 
-static const char *standard_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow")
-};
-
-DECLARE_CHANNEL_LIST(standard);
-
-static const char *c120_channel_names[] =
-{
-  N_("Black"),
-  N_("Black"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Yellow")
-};
-
-DECLARE_CHANNEL_LIST(c120);
-
-static const char *cx3800_channel_names[] =
-{
-  N_("Cyan"),
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Black")
-};
-
-DECLARE_CHANNEL_LIST(cx3800);
-
-static const char *mfp2005_channel_names[] =
-{
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Black")
-};
-
-DECLARE_CHANNEL_LIST(mfp2005);
-
-static const char *photo_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-};
-
-DECLARE_CHANNEL_LIST(photo);
-
-static const char *rx700_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Light Cyan"),
-  N_("Magenta"),
-  N_("Light Magenta"),
-  N_("Yellow"),
-};
-
-DECLARE_CHANNEL_LIST(rx700);
-
-static const char *sp1400_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Black"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Magenta"),
-  N_("Cyan"),
-};
-
-DECLARE_CHANNEL_LIST(sp1400);
-
-static const char *sp2200_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Light Black"),
-};
-
-DECLARE_CHANNEL_LIST(sp2200);
-
-static const char *pm_950c_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Dark Yellow"),
-};
-
-DECLARE_CHANNEL_LIST(pm_950c);
-
-static const char *sp960_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Black"),
-};
-
-DECLARE_CHANNEL_LIST(sp960);
-
-static const char *r800_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Matte Black"),
-  N_("Photo Black"),
-  N_("Red"),
-  N_("Blue"),
-  N_("Gloss Optimizer"),
-};
-
-DECLARE_CHANNEL_LIST(r800);
-
-static const char *picturemate_6_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Black"),
-  N_("Red"),
-  N_("Blue"),
-};
-
-DECLARE_CHANNEL_LIST(picturemate_6);
-
-static const char *picturemate_4_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Black"),
-};
-
-DECLARE_CHANNEL_LIST(picturemate_4);
-
-static const char *r2400_channel_names[] =
-{
-  N_("Light Light Black"),
-  N_("Light Magenta"),
-  N_("Light Cyan"),
-  N_("Light Black"),
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-};
-
-DECLARE_CHANNEL_LIST(r2400);
-
-typedef struct
-{
-  const char *name;
-  const channel_name_t *channel_name;
-} channel_t;
-
-static const channel_t the_channels[] =
-{
-  { "cx3800", &cx3800_channel_name_list },
-  { "mfp2005", &mfp2005_channel_name_list },
-  { "photo", &photo_channel_name_list },
-  { "picturemate_6", &picturemate_6_channel_name_list },
-  { "picturemate_4", &picturemate_4_channel_name_list },
-  { "pm_950c", &pm_950c_channel_name_list },
-  { "r2400", &r2400_channel_name_list },
-  { "sp1400", &sp1400_channel_name_list },
-  { "r800", &r800_channel_name_list },
-  { "rx700", &rx700_channel_name_list },
-  { "sp2200", &sp2200_channel_name_list },
-  { "sp960", &sp960_channel_name_list },
-  { "standard", &standard_channel_name_list },
-  { "c120", &c120_channel_name_list },
-};
-
-const channel_name_t *
-stpi_escp2_get_channel_names_named(const char *n)
+const inkname_t *
+stpi_escp2_get_default_black_inkset(void)
 {
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_channels) / sizeof(channel_t); i++)
-      {
-	if (strcmp(n, the_channels[i].name) == 0)
-	  return the_channels[i].channel_name;
-      }
-  return NULL;
+  if (! default_black_inkgroup)
+    {
+      default_black_inkgroup = load_inkgroup("escp2/inks/defaultblack.xml");
+      if (! default_black_inkgroup ||
+	  default_black_inkgroup->n_inklists < 1 ||
+	  default_black_inkgroup->inklists[0].n_inks < 1)
+	{
+	  stp_erprintf("Default black inkgroup: %x\n", (int) default_black_inkgroup);
+	  stp_erprintf("Unable to load default black ink definition!\n");
+	  stp_abort();
+	}
+    }
+  return &(default_black_inkgroup->inklists[0].inknames[0]);
 }
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index af8e005..abaac0f 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.38 2007/12/30 05:38:44 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.54 2008/07/26 23:15:47 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -53,8 +53,8 @@ escp2_reset_printer(stp_vars_t *v)
    * Magic initialization string that's needed to take printer out of
    * packet mode.
    */
-  if (pd->init_sequence)
-    stp_zfwrite(pd->init_sequence->data, pd->init_sequence->bytes, 1, v);
+  if (pd->preinit_sequence)
+    stp_zfwrite(pd->preinit_sequence->data, pd->preinit_sequence->bytes, 1, v);
 
   stp_send_command(v, "\033@", "");
 }
@@ -103,9 +103,12 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Xdpi", pd->res->hres);
   print_remote_int_param(v, "Printed_ydpi", pd->res->printed_vres);
   print_remote_int_param(v, "Printed_xdpi", pd->res->printed_hres);
+/*
   print_remote_int_param(v, "Use_softweave", pd->res->softweave);
-  print_remote_int_param(v, "Use_printer_weave", pd->res->printer_weave);
+  print_remote_int_param(v, "Printer_weave", pd->res->printer_weave);
+*/
   print_remote_int_param(v, "Use_printer_weave", pd->use_printer_weave);
+  print_remote_int_param(v, "Duplex", pd->duplex);
   print_remote_int_param(v, "Page_left", pd->page_left);
   print_remote_int_param(v, "Page_right", pd->page_right);
   print_remote_int_param(v, "Page_top", pd->page_top);
@@ -136,7 +139,6 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Unit_scale", pd->unit_scale);
   print_remote_int_param(v, "Zero_advance", pd->send_zero_pass_advance);
   print_remote_int_param(v, "Bits", pd->bitwidth);
-  print_remote_int_param(v, "Resid", pd->ink_resid);
   print_remote_int_param(v, "Drop Size", pd->drop_size);
   print_remote_int_param(v, "Initial_vertical_offset", pd->initial_vertical_offset);
   print_remote_int_param(v, "Channels_in_use", pd->channels_in_use);
@@ -146,17 +148,18 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Use_fast_360", pd->use_fast_360);
   print_remote_int_param(v, "Command_set", pd->command_set);
   print_remote_int_param(v, "Variable_dots", pd->variable_dots);
-  print_remote_int_param(v, "Has_vacuum", pd->has_vacuum);
   print_remote_int_param(v, "Has_graymode", pd->has_graymode);
   print_remote_int_param(v, "Base_separation", pd->base_separation);
   print_remote_int_param(v, "Resolution_scale", pd->resolution_scale);
+#if 0
   print_remote_int_param(v, "Printing_resolution", pd->printing_resolution);
+#endif
   print_remote_int_param(v, "Separation_rows", pd->separation_rows);
   print_remote_int_param(v, "Pseudo_separation_rows", pd->pseudo_separation_rows);
   print_remote_int_param(v, "Extra_720dpi_separation", pd->extra_720dpi_separation);
   print_remote_int_param(v, "Use_aux_channels", pd->use_aux_channels);
   print_remote_param(v, "Ink name", pd->inkname->name);
-  print_remote_int_param(v, "  channels", pd->inkname->channel_set->channel_count);
+  print_remote_int_param(v, "  channels", pd->inkname->channel_count);
   print_remote_int_param(v, "  inkset", pd->inkname->inkset);
   for (i = 0; i < count; i++)
     {
@@ -210,56 +213,50 @@ escp2_set_remote_sequence(stp_vars_t *v)
 {
   /* Magic remote mode commands, whatever they do */
   escp2_privdata_t *pd = get_privdata(v);
+  const stp_vars_t *pv = pd->media_settings;
 
   if (stp_get_debug_level() & STP_DBG_MARK_FILE)
     print_debug_params(v);
   if (pd->advanced_command_set || pd->input_slot)
     {
-      int feed_sequence = 0;
       /* Enter remote mode */
       stp_send_command(v, "\033(R", "bcs", 0, "REMOTE1");
-      if (pd->command_set == MODEL_COMMAND_PRO)
-	{
-	  if (pd->paper_type)
-	    {
-	      stp_send_command(v, "PH", "bcc", 0,
-			       pd->paper_type->paper_thickness);
-	      if (pd->has_vacuum)
-		stp_send_command(v, "SN", "bccc", 0, 5,
-				 pd->paper_type->vacuum_intensity);
-	      stp_send_command(v, "SN", "bccc", 0, 4,
-			       pd->paper_type->feed_adjustment);
-	    }
-	}
-      else if (pd->advanced_command_set)
+      /* Per the manual, job setup comes first, then SN command */
+      if (pd->input_slot &&
+	  pd->input_slot->roll_feed_cut_flags == ROLL_FEED_CUT_ALL)
+	      stp_send_command(v, "JS", "bh", 0);
+      if (pd->preinit_remote_sequence)
+	stp_zfwrite(pd->preinit_remote_sequence->data,
+		    pd->preinit_remote_sequence->bytes, 1, v);
+      if (stp_check_int_parameter(pv, "FeedAdjustment", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "SN", "bccc", 0, 4,
+			 stp_get_int_parameter(pv, "FeedAdjustment"));
+      if (stp_check_int_parameter(pv, "VacuumIntensity", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "SN", "bccc", 0, 5,
+			 stp_get_int_parameter(pv, "VacuumIntensity"));
+      if (stp_check_int_parameter(pv, "ScanDryTime", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "DR", "bcch", 0, 1,
+			 (int) stp_get_float_parameter(pv, "ScanDryTime") * 1000);
+      if (stp_check_int_parameter(pv, "ScanMinDryTime", STP_PARAMETER_ACTIVE))
 	{
-	  if (pd->paper_type)
-	    feed_sequence = pd->paper_type->paper_feed_sequence;
-	  /* Function unknown */
-	  stp_send_command(v, "PM", "bh", 0);
-	  /* Set mechanism sequence */
-	  stp_send_command(v, "SN", "bccc", 0, 0, feed_sequence);
-	  if (stp_get_boolean_parameter(v, "FullBleed"))
-	    {
-	      stp_send_command(v, "FP", "bch", 0,
-			       (unsigned short) -pd->zero_margin_offset);
-	      if (pd->borderless_sequence)
-		stp_zfwrite(pd->borderless_sequence->data,
-			    pd->borderless_sequence->bytes,
-			    1, v);
-	    }
+	  stp_send_command(v, "DR", "bcccc", 0, 0x41, 0xff, 0xff);
+	  stp_send_command(v, "DR", "bcch", 0, 1,
+			   (int) stp_get_float_parameter(pv, "ScanMinDryTime") * 1000);
 	}
+      if (stp_check_int_parameter(pv, "PageDryTime", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "DR", "bcch", 0, 1,
+			 (int) stp_get_float_parameter(pv, "PageDryTime"));
+      /* Next comes paper path */
       if (pd->input_slot)
 	{
 	  int divisor = pd->base_separation / 360;
 	  int height = pd->page_true_height * 5 / divisor;
-	  if (pd->input_slot->init_sequence.bytes)
-	    stp_zfwrite(pd->input_slot->init_sequence.data,
-			pd->input_slot->init_sequence.bytes, 1, v);
+	  if (pd->input_slot->init_sequence)
+	    stp_zfwrite(pd->input_slot->init_sequence->data,
+			pd->input_slot->init_sequence->bytes, 1, v);
 	  switch (pd->input_slot->roll_feed_cut_flags)
 	    {
 	    case ROLL_FEED_CUT_ALL:
-	      stp_send_command(v, "JS", "bh", 0);
 	      stp_send_command(v, "CO", "bccccl", 0, 0, 1, 0, 0);
 	      stp_send_command(v, "CO", "bccccl", 0, 0, 0, 0, height);
 	      break;
@@ -271,7 +268,39 @@ escp2_set_remote_sequence(stp_vars_t *v)
 	      break;
 	    }
 	}
-
+      if (stp_check_int_parameter(pv, "PaperMedia", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "MI", "bcccc", 0, 1,
+			 stp_get_int_parameter(pv, "PaperMedia"),
+			 (stp_check_int_parameter(pv, "PaperMediaSize", STP_PARAMETER_ACTIVE) ?
+			  stp_get_int_parameter(pv, "PaperMediaSize") :
+			  99));	/* User-defined size (for now!) */
+      if (pd->duplex)
+	{
+	  /* 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))
+	    stp_send_command(v, "DP", "bcc", 0, 2); /* Auto duplex */
+	  else
+	    stp_send_command(v, "DP", "bcc", 0, 2); /* Auto duplex */
+	}
+      if (stp_check_int_parameter(pv, "PaperThickness", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "PH", "bcc", 0,
+			 stp_get_int_parameter(pv, "PaperThickness"));
+      if (stp_check_int_parameter(pv, "FeedSequence", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "SN", "bccc", 0, 0,
+			 stp_get_int_parameter(pv, "FeedSequence"));
+      if (stp_check_int_parameter(pv, "PlatenGap", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "US", "bccc", 0, 1,
+			 stp_get_int_parameter(pv, "PlatenGap"));
+      if (stp_get_boolean_parameter(v, "FullBleed"))
+	{
+	  stp_send_command(v, "FP", "bch", 0,
+			   (unsigned short) -pd->zero_margin_offset);
+	  if (pd->borderless_sequence)
+	    stp_zfwrite(pd->borderless_sequence->data,
+			pd->borderless_sequence->bytes,
+			1, v);
+	}
       /* Exit remote mode */
 
       stp_send_command(v, "\033", "ccc", 0, 0, 0);
@@ -314,12 +343,10 @@ static void
 escp2_set_printer_weave(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  int printer_weave_parm = 0;
   if (pd->printer_weave)
-    printer_weave_parm = pd->printer_weave->value;
-  else if (pd->res->printer_weave)
-    printer_weave_parm = pd->res->printer_weave;
-  stp_send_command(v, "\033(i", "bc", printer_weave_parm);
+    stp_zfwrite(pd->printer_weave->data, pd->printer_weave->bytes, 1, v);
+  else
+    stp_send_command(v, "\033(i", "bc", 0);
 }
 
 static void
@@ -327,12 +354,13 @@ escp2_set_printhead_speed(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   const char *direction = stp_get_string_parameter(v, "PrintingDirection");
-  int unidirectional;
+  int unidirectional = -1;
   if (direction && strcmp(direction, "Unidirectional") == 0)
     unidirectional = 1;
   else if (direction && strcmp(direction, "Bidirectional") == 0)
     unidirectional = 0;
-  else if (pd->res->printed_hres * pd->res->printed_vres *
+  else if (pd->bidirectional_upper_limit >= 0 &&
+	   pd->res->printed_hres * pd->res->printed_vres *
 	   pd->res->vertical_passes >= pd->bidirectional_upper_limit)
     {
       stp_dprintf(STP_DBG_ESCP2, v,
@@ -344,7 +372,7 @@ escp2_set_printhead_speed(stp_vars_t *v)
 		  pd->bidirectional_upper_limit);
       unidirectional = 1;
     }
-  else
+  else if (pd->bidirectional_upper_limit >= 0)
     {
       stp_dprintf(STP_DBG_ESCP2, v,
 		  "Setting bidirectional: hres %d vres %d passes %d total %d limit %d\n",
@@ -355,13 +383,13 @@ escp2_set_printhead_speed(stp_vars_t *v)
 		  pd->bidirectional_upper_limit);
       unidirectional = 0;
     }
-  if (unidirectional)
+  if (unidirectional == 1)
     {
       stp_send_command(v, "\033U", "c", 1);
-      if (pd->res->hres > pd->printing_resolution)
+      if (pd->res->hres > pd->physical_xdpi)
 	stp_send_command(v, "\033(s", "bc", 2);
     }
-  else
+  else if (unidirectional == 0)
     stp_send_command(v, "\033U", "c", 0);
 }
 
@@ -410,10 +438,14 @@ escp2_set_paper_dimensions(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   if (pd->advanced_command_set)
     {
+      const stp_vars_t *pv = pd->media_settings;
       int w = pd->page_true_width * pd->page_management_units / 72;
       int h = (pd->page_true_height + pd->paper_extra_bottom) *
 	pd->page_management_units / 72;
       stp_send_command(v, "\033(S", "bll", w, h);
+      if (stp_check_int_parameter(pv, "PrintMethod", STP_PARAMETER_ACTIVE))
+	stp_send_command(v, "\033(m", "bc", 
+			 stp_get_int_parameter(pv, "PrintMethod"));
     }
 }
 
@@ -428,7 +460,7 @@ escp2_set_printhead_resolution(stp_vars_t *v)
 
       xres = pd->resolution_scale / pd->physical_xdpi;
 
-      if (pd->command_set == MODEL_COMMAND_PRO && !pd->res->softweave)
+      if (pd->command_set == MODEL_COMMAND_PRO && pd->printer_weave)
 	yres = yres /  pd->res->vres;
       else if (pd->split_channel_count > 1)
 	yres = yres * pd->nozzle_separation / pd->base_separation *
@@ -507,7 +539,8 @@ send_print_command(stp_vars_t *v, stp_pass_t *pass, int ncolor, int nlines)
   if (pd->command_set == MODEL_COMMAND_PRO || pd->variable_dots)
     {
       int nwidth = pd->bitwidth * ((lwidth + 7) / 8);
-      stp_send_command(v, "\033i", "ccchh", ncolor, COMPRESSION,
+      stp_send_command(v, "\033i", "ccchh", ncolor,
+		       (stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ? 0 : 1,
 		       pd->bitwidth, nwidth, nlines);
     }
   else
@@ -525,8 +558,9 @@ send_print_command(stp_vars_t *v, stp_pass_t *pass, int ncolor, int nlines)
 	ygap *= pd->pseudo_separation_rows;
       else
 	ygap *= pd->separation_rows;
-      stp_send_command(v, "\033.", "cccch", COMPRESSION, ygap, xgap, nlines,
-		       lwidth);
+      stp_send_command(v, "\033.", "cccch",
+		       (stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ? 0 : 1,
+		       ygap, xgap, nlines, lwidth);
     }
 }
 
@@ -536,39 +570,43 @@ send_extra_data(stp_vars_t *v, int extralines)
   escp2_privdata_t *pd = get_privdata(v);
   int lwidth = (pd->image_printed_width + (pd->horizontal_passes - 1)) /
     pd->horizontal_passes;
-#ifdef TEST_UNCOMPRESSED
-  int i;
-  for (i = 0; i < pd->bitwidth * (lwidth + 7) / 8; i++)
-    stp_putc(0, v);
-#else  /* !TEST_UNCOMPRESSED */
-  int k, l;
-  int bytes_to_fill = pd->bitwidth * ((lwidth + 7) / 8);
-  int full_blocks = bytes_to_fill / 128;
-  int leftover = bytes_to_fill % 128;
-  int total_bytes = extralines * (full_blocks + 1) * 2;
-  unsigned char *buf = stp_malloc(total_bytes);
-  total_bytes = 0;
-  for (k = 0; k < extralines; k++)
+  if (stp_get_debug_level() & STP_DBG_NO_COMPRESSION)
     {
-      for (l = 0; l < full_blocks; l++)
-	{
-	  buf[total_bytes++] = 129;
-	  buf[total_bytes++] = 0;
-	}
-      if (leftover == 1)
-	{
-	  buf[total_bytes++] = 1;
-	  buf[total_bytes++] = 0;
-	}
-      else if (leftover > 0)
+      int i, k;
+      for (k = 0; k < extralines; k++)
+	for (i = 0; i < pd->bitwidth * (lwidth + 7) / 8; i++)
+	  stp_putc(0, v);
+    }
+  else
+    {
+      int k, l;
+      int bytes_to_fill = pd->bitwidth * ((lwidth + 7) / 8);
+      int full_blocks = bytes_to_fill / 128;
+      int leftover = bytes_to_fill % 128;
+      int total_bytes = extralines * (full_blocks + 1) * 2;
+      unsigned char *buf = stp_malloc(total_bytes);
+      total_bytes = 0;
+      for (k = 0; k < extralines; k++)
 	{
-	  buf[total_bytes++] = 257 - leftover;
-	  buf[total_bytes++] = 0;
+	  for (l = 0; l < full_blocks; l++)
+	    {
+	      buf[total_bytes++] = 129;
+	      buf[total_bytes++] = 0;
+	    }
+	  if (leftover == 1)
+	    {
+	      buf[total_bytes++] = 1;
+	      buf[total_bytes++] = 0;
+	    }
+	  else if (leftover > 0)
+	    {
+	      buf[total_bytes++] = 257 - leftover;
+	      buf[total_bytes++] = 0;
+	    }
 	}
+      stp_zfwrite((const char *) buf, total_bytes, 1, v);
+      stp_free(buf);
     }
-  stp_zfwrite((const char *) buf, total_bytes, 1, v);
-  stp_free(buf);
-#endif /* TEST_UNCOMPRESSED */
 }
 
 void
@@ -596,16 +634,16 @@ stpi_escp2_deinit_printer(stp_vars_t *v)
   if (pd->advanced_command_set || pd->input_slot)
     {
       stp_send_command(v, "\033(R", "bcs", 0, "REMOTE1");
-      if (pd->input_slot && pd->input_slot->deinit_sequence.bytes)
-	stp_zfwrite(pd->input_slot->deinit_sequence.data,
-		    pd->input_slot->deinit_sequence.bytes, 1, v);
+      if (pd->input_slot && pd->input_slot->deinit_sequence)
+	stp_zfwrite(pd->input_slot->deinit_sequence->data,
+		    pd->input_slot->deinit_sequence->bytes, 1, v);
       /* Load settings from NVRAM */
       stp_send_command(v, "LD", "b");
 
       /* Magic deinit sequence reported by Simone Falsini */
-      if (pd->deinit_sequence)
-	stp_zfwrite(pd->deinit_sequence->data, pd->deinit_sequence->bytes,
-		    1, v);
+      if (pd->deinit_remote_sequence)
+	stp_zfwrite(pd->deinit_remote_sequence->data,
+		    pd->deinit_remote_sequence->bytes, 1, v);
       /* Exit remote mode */
       stp_send_command(v, "\033", "ccc", 0, 0, 0);
     }
@@ -622,6 +660,7 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
   stp_pass_t *pass = stp_get_pass_by_pass(v, passno);
   stp_linecount_t *linecount = stp_get_linecount_by_pass(v, passno);
   int minlines = pd->min_nozzles;
+  int nozzle_start = pd->nozzle_start;
 
   for (j = 0; j < pd->channels_in_use; j++)
     {
@@ -640,23 +679,37 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 	    {
 	      int sc = pd->split_channel_count;
 	      int k, l;
+	      int minlines_lo, nozzle_start_lo;
+	      minlines /= sc;
+	      nozzle_start /= sc;
+	      minlines_lo = pd->min_nozzles - (minlines * sc);
+	      nozzle_start_lo = pd->nozzle_start - (nozzle_start * sc);
 	      for (k = 0; k < sc; k++)
 		{
+		  int ml = minlines + (k < minlines_lo ? 1 : 0);
+		  int ns = nozzle_start + (k < nozzle_start_lo ? 1 : 0);
 		  int lc = ((nlines + (sc - k - 1)) / sc);
-		  if (lc < minlines)
-		    {
-		      extralines = minlines - lc;
-		    }
+		  int base = (pd->nozzle_start + k) % sc;
+		  if (lc < ml)
+		    extralines = ml - lc;
+		  else
+		    extralines = 0;
+		  extralines -= ns;
+		  if (extralines < 0)
+		    extralines = 0;
 		  if (lc + extralines > 0)
 		    {
+		      int sc_off = k + j * sc;
 		      set_horizontal_position(v, pass, vertical_subpass);
-		      send_print_command(v, pass, pd->split_channels[k],
-					 lc + extralines);
+		      send_print_command(v, pass, pd->split_channels[sc_off],
+					 lc + extralines + ns);
+		      if (ns > 0)
+			send_extra_data(v, ns);
 		      for (l = 0; l < lc; l++)
 			{
-			  int sp = (l * sc) + k;
+			  int sp = (l * sc) + base;
 			  unsigned long offset = sp * pd->split_channel_width;
-			  if (COMPRESSION)
+			  if (!(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
 			    {
 			      unsigned char *comp_ptr;
 			      stp_pack_tiff(v, bufs->v[j] + offset,
@@ -669,7 +722,7 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 			    stp_zfwrite((const char *) bufs->v[j] + offset,
 					pd->split_channel_width, 1, v);
 			}
-		      if (extralines)
+		      if (extralines > 0)
 			send_extra_data(v, extralines);
 		      stp_send_command(v, "\r", "");
 		    }
@@ -684,12 +737,14 @@ stpi_escp2_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
 		  nlines = minlines;
 		}
 	      send_print_command(v, pass, ncolor, nlines);
-
+	      extralines -= nozzle_start;
 	      /*
 	       * Send the data
 	       */
+	      if (nozzle_start)
+		send_extra_data(v, nozzle_start);
 	      stp_zfwrite((const char *)bufs->v[j], lineoffs->v[j], 1, v);
-	      if (extralines)
+	      if (extralines > 0)
 		send_extra_data(v, extralines);
 	      stp_send_command(v, "\r", "");
 	    }
@@ -705,7 +760,7 @@ stpi_escp2_terminate_page(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   if (!pd->input_slot ||
-      pd->input_slot->roll_feed_cut_flags != ROLL_FEED_DONT_EJECT)
+      !(pd->input_slot->roll_feed_cut_flags & ROLL_FEED_DONT_EJECT))
     {
       if (!pd->printed_something)
 	stp_send_command(v, "\n", "");
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
deleted file mode 100644
index b772744..0000000
--- a/src/main/escp2-inks.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * "$Id: escp2-inks.c,v 1.62 2008/02/03 03:41:43 rlk Exp $"
- *
- *   Print plug-in EPSON ESC/P2 driver for the GIMP.
- *
- *   Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
- *	Robert Krawitz (rlk@alum.mit.edu)
- *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gutenprint/gutenprint.h>
-#include "gutenprint-internal.h"
-#include <gutenprint/gutenprint-intl-internal.h>
-#include "print-escp2.h"
-
-/* Single drop size printers */
-static const escp2_dropsize_t escp2_single_dropsizes =
-  { "single", 1, { 1.0 } };
-
-/* 6 pl printers */
-static const escp2_dropsize_t escp2_low_dropsizes =
-  { "low", 3, { 0.28, 0.58, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_dropsizes =
-  { "6pl", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_1440_dropsizes =
-  { "6pl_1440", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_2880_dropsizes =
-  { "6pl_2880", 1, { 1.0 } };
-
-/* Stylus Color 480/580/C40/C50 */
-static const escp2_dropsize_t escp2_x80_low_dropsizes =
-  { "x80_low", 3, { 0.325, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_x80_6pl_dropsizes =
-  { "x80_6pl", 3, { 0.325, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_x80_1440_6pl_dropsizes =
-  { "x80_1440_6pl", 2, { 0.65, 1.0 } };
-static const escp2_dropsize_t escp2_x80_2880_6pl_dropsizes =
-  { "x80_2880_6pl", 1, { 1.0 } };
-
-/* 2880 DPI capable 4 picolitre printers */
-static const escp2_dropsize_t escp2_new_low_dropsizes =
-  { "680_low", 3, { 0.375, 0.75, 1.0 } };
-static const escp2_dropsize_t escp2_new_6pl_dropsizes =
-  { "680_6pl", 3, { 0.375, 0.50, 1.0 } };
-static const escp2_dropsize_t escp2_new_4pl_dropsizes =
-  { "680_4pl", 3, { 0.50, 0.75, 1.0 } };
-static const escp2_dropsize_t escp2_4pl_2880_dropsizes =
-  { "4pl_2880", 1, { 1.0 } };
-
-/* 1440 DPI capable printers */
-static const escp2_dropsize_t escp2_4pl_dropsizes =
-  { "4pl", 3, { 0.33, 0.50, 1.0 } };
-
-/* Stylus Color 900/980 */
-static const escp2_dropsize_t escp2_3pl_dropsizes =
-  { "3pl", 3, { 0.25, 0.61, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_1440_dropsizes =
-  { "3pl_1440", 2, { 0.39, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_2880_dropsizes =
-  { "3pl_2880", 1, { 1.0 } };
-static const escp2_dropsize_t escp2_980_6pl_dropsizes =
-  { "980_6pl", 3, { 0.40, 0.675, 1.0 } };
-
-/* Stylus Photo 960 */
-static const escp2_dropsize_t escp2_2pl_360_dropsizes =
-  { "2pl_360", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_2pl_720_dropsizes =
-  { "2pl_720", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_2pl_1440_dropsizes =
-  { "2pl_1440", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_2pl_2880_dropsizes =
-  { "2pl_2880", 1, { 1.0 } };
-
-/* PM-G800 */
-/* Guess */
-static const escp2_dropsize_t escp2_1_5pl_360_dropsizes =
-  { "1_5pl_360", 1, { 1, 0, 1.0 } };
-/* 7, 14, 20 pl */
-static const escp2_dropsize_t escp2_1_5pl_720_dropsizes =
-  { "1_5pl_720", 3, { 0.35, 0.70, 1.0 } };
-/*
- * Note that the site
- * (http://www.i-love-epson.co.jp/products/printer/inkjet/pmg800/pmg8002.htm)
- * is unclear: it says 3 pl MSDT, but the diagram reads 2 pl
- */
-/* 3, 6, 13 pl */
-/* Looks like 3, 7.5, 15 */
-static const escp2_dropsize_t escp2_1_5pl_1440_dropsizes =
-  { "1_5pl_1440", 3, { 0.2, 0.5, 1.0 } };
-/*
- * See above comment.  3 pl makes more sense than 2 pl
- */
-/* 1.5, 3, 6 pl */
-/* Looks like 1.5, 3.25, 6 */
-static const escp2_dropsize_t escp2_1_5pl_2880_dropsizes =
-  { "1_5pl_2880", 3, { 0.25, 0.47, 1.0 } };
-static const escp2_dropsize_t escp2_1_5pl_2880_2880_dropsizes =
-  { "1_5pl_2880_2880", 2, { 0.53, 1.0 } };
-static const escp2_dropsize_t escp2_1_5pl_5760_dropsizes =
-  { "1_5pl_5760", 1, { 1.0 } };
-
-/* E-100/Picturemate */
-static const escp2_dropsize_t escp2_picturemate_1440_dropsizes =
-  { "picturemate_1440", 3, { 0.4, 0.65, 1.0 } };
-static const escp2_dropsize_t escp2_picturemate_2880_dropsizes =
-  { "picturemate_2880", 2, { 0.615, 1.0 } };
-static const escp2_dropsize_t escp2_picturemate_5760_dropsizes =
-  { "picturemate_5760", 1, { 1.0 } };
-
-/* Stylus Photo R300 */
-static const escp2_dropsize_t escp2_r300_360_dropsizes =
-  { "r300_360", 3, { 0.15, 0.3, 1.0 } };
-static const escp2_dropsize_t escp2_r300_720_dropsizes =
-  { "r300_720", 3, { 0.15, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_r300_1440_dropsizes =
-  { "r300_1440", 3, { 0.29, 0.48, 1.0 } };
-static const escp2_dropsize_t escp2_r300_2880_dropsizes =
-  { "r300_2880", 2, { 0.604, 1.0 } };
-static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes =
-  { "r300_2880_1440", 1, { 1.0 } };
-
-/* Claria inks */
-
-/*
- * Tested relative drop sizes:
- *      S       M       L
- *
- * 0x21 3       4       5
- * 0x23 2       3       4
- * 0x24 1       3       5
- * 0x25 1       2       3
- * 0x26 2       3       5
- * 0x33 1       3       5
- *
- * Therefore, there's no real point to use drop sizes other than 0x24
- * and 0x25.  The economy settings (0x10 and 0x0) don't provide any
- * bigger drops.  We get quite smooth output at 720x360 and 360 DPI, and
- * even 360x180 is surprisingly smooth.
- * Roy Harrington's estimates in first column; my remeasurements in second:
- *
- * 1  1.5 pl			1.5 pl
- * 2  2.4 pl			1.8 pl
- * 3  6.3 pl			4.5 pl
- * 4 12   pl (rlk estimate)	8.0 pl
- * 5 21   pl		       11   pl (+/- 1 pl)
- */
-
-static const escp2_dropsize_t escp2_claria_720_dropsizes =
-  { "claria_720", 3, { 0.125, 0.42, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1440_dropsizes =
-  { "claria_1440", 3, { 0.338, 0.40, 1.0 } };
-static const escp2_dropsize_t escp2_claria_2880_dropsizes =
-  { "claria_2880", 2, { 0.833, 1.0 } };
-static const escp2_dropsize_t escp2_claria_5760_dropsizes =
-  { "claria_5760", 1, { 1.0 } };
-
-/* Stylus Photo 1400 */
-
-/*
- * Tested relative drop sizes:
-* 	S	M	L
-*
-* 0x21	3	4	5
-* 0x25	1	2	3
-* 0x33	1	3	5
-* 0x34	2	3	5
-*/
-
-static const escp2_dropsize_t escp2_claria_1400_720_dropsizes =
-  { "claria_1400_720", 3, { 0.42, 0.67, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_1440_720_dropsizes =
-  { "claria_1400_1440_720", 3, { 0.125, 0.42, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_1440_dropsizes =
-  { "claria_1400_1440", 3, { 0.338, 0.40, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_2880_dropsizes =
-  { "claria_1400_2880", 2, { 0.833, 1.0 } };
-static const escp2_dropsize_t escp2_claria_1400_5760_dropsizes =
-  { "claria_1400_5760", 1, { 1.0 } };
-
-/* Stylus Photo R2400 */
-static const escp2_dropsize_t escp2_r2400_360_dropsizes =
-  { "r2400_360", 1, { 1 } };
-static const escp2_dropsize_t escp2_r2400_720_dropsizes =
-  { "r2400_720", 3, { 0.180, 0.44, 1 } };
-static const escp2_dropsize_t escp2_r2400_1440_dropsizes =
-  { "r2400_1440", 3, { 0.180, 0.44, 1 } };
-static const escp2_dropsize_t escp2_r2400_2880_dropsizes =
-  { "r2400_2880", 3, { 0.180, 0.44, 1 } };
-static const escp2_dropsize_t escp2_r2400_2880_1440_dropsizes =
-  { "r2400_2880_1440", 2, { 0.41, 1 } };
-static const escp2_dropsize_t escp2_r2400_2880_2880_dropsizes =
-  { "r2400_2880_2880", 1, { 1.0 } };
-
-/* Stylus C80 */
-static const escp2_dropsize_t escp2_economy_pigment_dropsizes =
-  { "economy_pigment", 3, { 0, 0, 1.0 } };
-static const escp2_dropsize_t escp2_low_pigment_dropsizes =
-  { "low_pigment", 3, { 0.28, 0, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_pigment_dropsizes =
-  { "6pl_pigment", 3, { 0.28, 0, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_dropsizes =
-  { "3pl_pigment", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_2880_dropsizes =
-  { "3pl_pigment_2880", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_5760_dropsizes =
-  { "3pl_pigment_5760", 1, { 1.0 } };
-
-/* Stylus C66 */
-static const escp2_dropsize_t escp2_economy_pigment_c66_dropsizes =
-  { "economy_pigment_c66", 3, { 0, 0, 1.0 } };
-static const escp2_dropsize_t escp2_low_pigment_c66_dropsizes =
-  { "low_pigment_c66", 3, { 0.125, 0.25, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_pigment_c66_dropsizes =
-  { "6pl_pigment_c66", 3, { 0.28, 0, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c66_dropsizes =
-  { "3pl_pigment_c66", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c66_2880_dropsizes =
-  { "3pl_pigment_c66_2880", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c66_5760_dropsizes =
-  { "3pl_pigment_c66_5760", 1, { 1.0 } };
-
-/* Stylus C120 */
-static const escp2_dropsize_t escp2_low_pigment_c120_dropsizes =
-  { "low_pigment_c120", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_6pl_pigment_c120_dropsizes =
-  { "6pl_pigment_c120", 3, { 0.12, 0.3, 1.0 } };
-/*  { "6pl_pigment_c120", 3, { 0.15, 0.3, 1.0 } }; */
-/*  { "6pl_pigment_c120", 3, { 0.18, 0.333, 1.0 } }; */
-static const escp2_dropsize_t escp2_3pl_pigment_c120_dropsizes =
-  { "3pl_pigment_c120", 3, { 0.25, 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c120_2880_dropsizes =
-  { "3pl_pigment_c120_2880", 2, { 0.5, 1.0 } };
-static const escp2_dropsize_t escp2_3pl_pigment_c120_5760_dropsizes =
-  { "3pl_pigment_c120_5760", 1, { 1.0 } };
-
-/* Stylus Photo 2000P */
-static const escp2_dropsize_t escp2_2000p_dropsizes =
-  { "2000p", 2, { 0.55, 1.0 } };
-
-/* Stylus Photo 2200, Stylus Pro 7600 */
-static const escp2_dropsize_t escp2_ultrachrome_low_dropsizes =
-  { "ultrachrome_low", 3, { 0.16, 0.4, 1.0 } };
-static const escp2_dropsize_t escp2_ultrachrome_720_dropsizes =
-  { "ultrachrome_720", 3, { 0.2, 0.45, 1.0 } };
-static const escp2_dropsize_t escp2_ultrachrome_2880_dropsizes =
-  { "ultrachrome_2880", 1, { 1.0 } };
-
-/* Stylus Pro 10000 */
-static const escp2_dropsize_t escp2_spro10000_dropsizes =
-  { "spro10000", 2, { 0.661, 1.0 } };
-
-static const escp2_drop_list_t simple_drops =
-{
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-  &escp2_single_dropsizes,
-};
-
-static const escp2_drop_list_t variable_6pl_drops =
-{
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_6pl_1440_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-  &escp2_6pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_x80_6pl_drops =
-{
-  &escp2_x80_low_dropsizes,
-  &escp2_x80_low_dropsizes,
-  &escp2_x80_low_dropsizes,
-  &escp2_x80_6pl_dropsizes,
-  &escp2_x80_1440_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-  &escp2_x80_2880_6pl_dropsizes,
-};
-
-static const escp2_drop_list_t variable_1440_4pl_drops =
-{
-  &escp2_low_dropsizes,
-  &escp2_low_dropsizes,
-  &escp2_low_dropsizes,
-  &escp2_6pl_dropsizes,
-  &escp2_4pl_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_2880_4pl_drops =
-{
-  &escp2_new_low_dropsizes,
-  &escp2_new_low_dropsizes,
-  &escp2_new_low_dropsizes,
-  &escp2_new_6pl_dropsizes,
-  &escp2_new_4pl_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-  &escp2_4pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_drops =
-{
-  &escp2_low_dropsizes,
-  &escp2_low_dropsizes,
-  &escp2_980_6pl_dropsizes,
-  &escp2_3pl_dropsizes,
-  &escp2_3pl_1440_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-  &escp2_3pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_2pl_drops =
-{
-  &escp2_2pl_360_dropsizes,
-  &escp2_2pl_360_dropsizes,
-  &escp2_2pl_360_dropsizes,
-  &escp2_2pl_720_dropsizes,
-  &escp2_2pl_1440_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-  &escp2_2pl_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pmg_drops =
-{
-  &escp2_r300_360_dropsizes,
-  &escp2_r300_360_dropsizes,
-  &escp2_r300_360_dropsizes,
-  &escp2_r300_720_dropsizes,
-  &escp2_r300_1440_dropsizes,
-  &escp2_r300_2880_dropsizes,
-  &escp2_r300_2880_1440_dropsizes,
-  &escp2_r300_2880_1440_dropsizes,
-  &escp2_r300_2880_1440_dropsizes,
-};
-
-static const escp2_drop_list_t claria_drops =
-{
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_720_dropsizes,
-  &escp2_claria_1440_dropsizes,
-  &escp2_claria_2880_dropsizes,
-  &escp2_claria_5760_dropsizes,
-};
-
-static const escp2_drop_list_t claria_1400_drops =
-{
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_720_dropsizes,
-  &escp2_claria_1400_720_dropsizes,
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_1440_720_dropsizes,
-  &escp2_claria_1400_1440_dropsizes,
-  &escp2_claria_1400_2880_dropsizes,
-  &escp2_claria_1400_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_r2400_drops =
-{
-  &escp2_r2400_360_dropsizes,
-  &escp2_r2400_360_dropsizes,
-  &escp2_r2400_720_dropsizes,
-  &escp2_r2400_720_dropsizes,
-  &escp2_r2400_1440_dropsizes,
-  &escp2_r2400_2880_dropsizes,
-  &escp2_r2400_2880_1440_dropsizes,
-  &escp2_r2400_2880_2880_dropsizes,
-  &escp2_r2400_2880_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_picturemate_drops =
-{
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_1440_dropsizes,
-  &escp2_picturemate_2880_dropsizes,
-  &escp2_picturemate_5760_dropsizes,
-  &escp2_picturemate_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_1_5pl_drops =
-{
-  &escp2_1_5pl_360_dropsizes,
-  &escp2_1_5pl_360_dropsizes,
-  &escp2_1_5pl_720_dropsizes,	/* Even though we use 0x10 drop size */
-  &escp2_1_5pl_720_dropsizes,
-  &escp2_1_5pl_1440_dropsizes,
-  &escp2_1_5pl_2880_dropsizes,
-  &escp2_1_5pl_2880_dropsizes,
-  &escp2_1_5pl_2880_2880_dropsizes,
-  &escp2_1_5pl_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_2000p_drops =
-{
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes,
-  &escp2_2000p_dropsizes
-};
-
-static const escp2_drop_list_t variable_ultrachrome_drops =
-{
-  &escp2_ultrachrome_low_dropsizes,
-  &escp2_ultrachrome_low_dropsizes,
-  &escp2_ultrachrome_low_dropsizes,
-  &escp2_ultrachrome_720_dropsizes,
-  &escp2_ultrachrome_720_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-  &escp2_ultrachrome_2880_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pigment_drops =
-{
-  &escp2_economy_pigment_dropsizes,
-  &escp2_low_pigment_dropsizes,
-  &escp2_low_pigment_dropsizes,
-  &escp2_6pl_pigment_dropsizes,
-  &escp2_3pl_pigment_dropsizes,
-  &escp2_3pl_pigment_2880_dropsizes,
-  &escp2_3pl_pigment_5760_dropsizes,
-  &escp2_3pl_pigment_5760_dropsizes,
-  &escp2_3pl_pigment_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pigment_c66_drops =
-{
-  &escp2_economy_pigment_c66_dropsizes,
-  &escp2_low_pigment_c66_dropsizes,
-  &escp2_low_pigment_c66_dropsizes,
-  &escp2_6pl_pigment_c66_dropsizes,
-  &escp2_3pl_pigment_c66_dropsizes,
-  &escp2_3pl_pigment_c66_2880_dropsizes,
-  &escp2_3pl_pigment_c66_5760_dropsizes,
-  &escp2_3pl_pigment_c66_5760_dropsizes,
-  &escp2_3pl_pigment_c66_5760_dropsizes,
-};
-
-static const escp2_drop_list_t variable_3pl_pigment_c120_drops =
-{
-  &escp2_low_pigment_c120_dropsizes,
-  &escp2_low_pigment_c120_dropsizes,
-  &escp2_6pl_pigment_c120_dropsizes,
-  &escp2_6pl_pigment_c120_dropsizes,
-  &escp2_3pl_pigment_c120_dropsizes,
-  &escp2_3pl_pigment_c120_2880_dropsizes,
-  &escp2_3pl_pigment_c120_5760_dropsizes,
-  &escp2_3pl_pigment_c120_5760_dropsizes,
-  &escp2_3pl_pigment_c120_5760_dropsizes,
-};
-
-static const escp2_drop_list_t spro10000_drops =
-{
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes,
-  &escp2_spro10000_dropsizes
-};
-
-
-typedef struct
-{
-  const char *name;
-  const escp2_drop_list_t *const drop_list;
-} drop_list_t;
-
-static const drop_list_t the_drop_lists[] =
-{
-  { "simple", &simple_drops },
-  { "spro10000", &spro10000_drops },
-  { "variable_1_5pl", &variable_1_5pl_drops },
-  { "variable_2pl", &variable_2pl_drops },
-  { "variable_3pl", &variable_3pl_drops },
-  { "variable_3pl_pigment", &variable_3pl_pigment_drops },
-  { "variable_3pl_pigment_c66", &variable_3pl_pigment_c66_drops },
-  { "variable_3pl_pigment_c120", &variable_3pl_pigment_c120_drops },
-  { "variable_3pl_pmg", &variable_3pl_pmg_drops },
-  { "variable_claria", &claria_drops },
-  { "variable_claria_1400", &claria_1400_drops },
-  { "variable_r2400", &variable_r2400_drops },
-  { "variable_picturemate", &variable_picturemate_drops },
-  { "variable_1440_4pl", &variable_1440_4pl_drops },
-  { "variable_ultrachrome", &variable_ultrachrome_drops },
-  { "variable_2880_4pl", &variable_2880_4pl_drops },
-  { "variable_6pl", &variable_6pl_drops },
-  { "variable_2000p", &variable_2000p_drops },
-  { "variable_x80_6pl", &variable_x80_6pl_drops },
-};
-
-const escp2_drop_list_t *
-stpi_escp2_get_drop_list_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_drop_lists) / sizeof(drop_list_t); i++)
-      {
-	if (strcmp(n, the_drop_lists[i].name) == 0)
-	  return the_drop_lists[i].drop_list;
-      }
-  return NULL;
-}
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 42a9fe5..457aa0c 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.108 2008/02/27 00:43:37 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.117 2008/07/06 02:17:43 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -29,2075 +29,505 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "print-escp2.h"
 
-static const char standard_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
-/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
-/* M */  "2.00 1.80 1.60 1.40 1.20 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
-/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char standard_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.56 0.58 0.62 0.68 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
-/* G */  "0.90 0.76 0.65 0.58 0.58 0.57 0.56 0.56 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char standard_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.32 -.32 -.32 -.32 "  /* M */
-/* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
-/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char photo2_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
-/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
-/* M */  "2.00 1.80 1.60 1.40 1.20 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
-/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo2_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.56 0.58 0.62 0.68 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
-/* G */  "0.90 0.76 0.65 0.58 0.58 0.57 0.56 0.56 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo2_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.32 -.32 -.32 -.32 "  /* M */
-/* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
-/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char photo3_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo3_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 "  /* B */
-/* B */  "0.91 0.88 0.82 0.78 0.78 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 "  /* G */
-/* G */  "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char photo3_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.01 -.03 -.06 -.10 -.15 -.20 -.25 "  /* B */
-/* B */  "-.28 -.30 -.34 -.35 -.35 -.34 -.33 -.33 "  /* M */
-/* M */  "-.36 -.40 -.44 -.48 -.50 -.45 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.02 -.04 -.08 -.13 "  /* G */
-/* G */  "-.18 -.18 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-
-static const char claria_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char claria_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 "  /* B */
-/* B */  "0.91 0.88 0.84 0.78 0.78 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 "  /* G */
-/* G */  "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char claria_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.01 -.03 -.06 -.10 -.15 -.20 -.25 "  /* B */
-/* B */  "-.30 -.35 -.38 -.40 -.42 -.46 -.49 -.52 "  /* M */
-/* M */  "-.55 -.57 -.57 -.55 -.52 -.48 -.40 -.30 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.02 -.04 -.08 -.13 "  /* G */
-/* G */  "-.18 -.18 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char sp960_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.58 0.60 0.65 0.69 0.74 0.79 0.82 0.84 "  /* B */
-/* B */  "0.86 0.81 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.99 0.98 0.97 0.96 0.94 0.93 0.89 "  /* G */
-/* G */  "0.86 0.73 0.65 0.58 0.59 0.59 0.58 0.58 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.23 -.24 -.25 -.26 -.27 "  /* M */
-/* M */  "-.28 -.33 -.38 -.45 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
-/* G */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
-/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
-/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
-/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.58 0.63 0.70 0.75 0.80 0.86 0.88 0.90 "  /* B */
-/* B */  "0.90 0.83 0.78 0.78 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.99 0.98 0.97 0.96 0.94 0.93 0.89 "  /* G */
-/* G */  "0.86 0.73 0.65 0.58 0.59 0.59 0.58 0.58 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char sp960_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.23 -.24 -.25 -.26 -.27 "  /* M */
-/* M */  "-.28 -.33 -.38 -.45 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* G */
-/* G */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 -.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char ultra_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 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.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.49 0.51 0.55 0.61 0.67 0.71 0.76 0.79 "  /* B */
-/* B */  "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.95 0.94 0.93 0.90 0.86 "  /* G */
-/* G */  "0.82 0.69 0.60 0.54 0.52 0.51 0.50 0.49 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
-/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_glossy_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 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.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_glossy_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.49 0.53 0.60 0.64 0.69 0.73 0.77 0.80 "  /* B */
-/* B */  "0.84 0.81 0.77 0.77 0.78 0.80 0.84 0.87 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 "  /* G */
-/* G */  "0.83 0.69 0.61 0.55 0.53 0.52 0.50 0.49 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_glossy_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
-/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char ultra_k3_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 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.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 "  /* B */
-/* B */  "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
-/* M */  "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.95 0.93 0.91 0.88 0.83 "  /* G */
-/* G */  "0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.17 -.18 "  /* G */
-/* G */  "-.19 -.20 -.19 -.18 -.16 -.12 -.08 -.04 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_glossy_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
-/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 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.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
-/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_glossy_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.55 0.57 0.61 0.64 0.67 0.69 0.72 0.75 "  /* B */
-/* B */  "0.75 0.71 0.70 0.70 0.72 0.76 0.81 0.87 "  /* M */
-/* M */  "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 "  /* G */
-/* G */  "0.83 0.71 0.65 0.61 0.58 0.56 0.55 0.55 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char ultra_k3_glossy_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
-/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
-/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
-/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char r800_matte_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.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.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.03 1.06 1.09 1.12 1.15 1.18 1.20 "  /* G */
-/* G */  "1.20 1.15 1.10 1.05 1.00 1.00 1.00 1.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_matte_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.75 0.75 0.75 0.75 0.76 0.80 0.85 0.90 "  /* B */
-/* B */  "0.90 0.88 0.82 0.78 0.78 0.82 0.85 0.92 "  /* M */
-/* M */  "0.98 0.98 0.97 0.97 0.96 0.96 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.96 0.93 "  /* G */
-/* G */  "0.88 0.87 0.86 0.85 0.82 0.79 0.76 0.75 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_matte_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.07 -.10 -.15 -.19 -.25 -.30 -.35 "  /* B */
-/* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.02 0.02 "  /* M */
-/* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
-/* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 0.02 0.05 0.09 0.13 0.15 0.16 0.17 "  /* G */
-/* G */  "0.17 0.17 0.16 0.15 0.13 0.09 0.05 0.02 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_glossy_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.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.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.03 1.06 1.09 1.12 1.15 1.18 1.20 "  /* G */
-/* G */  "1.20 1.15 1.10 1.05 1.00 1.00 1.00 1.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-static const char r800_glossy_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.75 0.75 0.75 0.75 0.76 0.80 0.85 0.90 "  /* B */
-/* B */  "0.90 0.88 0.82 0.85 0.87 0.89 0.91 0.95 "  /* M */
-/* M */  "0.98 0.98 0.97 0.97 0.96 0.96 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.96 0.93 "  /* G */
-/* G */  "0.88 0.87 0.86 0.85 0.82 0.79 0.76 0.75 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char r800_glossy_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 -.07 -.10 -.15 -.19 -.25 -.30 -.35 "  /* B */
-/* B */  "-.38 -.38 -.30 -.20 -.10 -.00 0.00 0.00 "  /* M */
-/* M */  "-.00 -.00 -.00 -.00 -.00 -.00 -.00 0.00 "  /* R */
-/* R */  "0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 0.02 0.05 0.09 0.13 0.15 0.16 0.17 "  /* G */
-/* G */  "0.17 0.17 0.16 0.15 0.13 0.09 0.05 0.02 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char durabrite3_sat_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.20 1.20 1.30 1.50 1.70 1.90 2.00 2.00 "  /* B */
-/* B */  "2.00 2.00 2.00 2.00 2.00 2.00 2.00 2.00 "  /* M */
-/* M */  "2.00 1.80 1.60 1.40 1.20 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.15 1.40 1.70 2.00 2.30 2.40 2.40 "  /* G */
-/* G */  "2.40 2.40 2.40 2.30 2.00 1.70 1.40 1.15 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char durabrite3_lum_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.63 0.64 0.66 0.69 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
-/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
-/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 0.99 0.98 0.97 0.95 0.93 "  /* G */
-/* G */  "0.90 0.76 0.68 0.65 0.64 0.63 0.63 0.63 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char durabrite3_hue_adj[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.00 0.00 -.02 -.04 -.08 -.12 -.16 "  /* B */
-/* B */  "-.20 -.24 -.28 -.32 -.36 -.37 -.38 -.39 "  /* M */
-/* M */  "-.40 -.45 -.50 -.52 -.52 -.50 -.45 -.40 "  /* R */
-/* R */  "-.35 -.27 -.15 -.06 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 -.00 -.03 -.06 -.09 -.13 -.17 -.21 "  /* G */
-/* G */  "-.25 -.22 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-
-#define DECLARE_PAPERS(name)			\
-static const paperlist_t name##_paper_list =	\
-{						\
-  #name,					\
-  sizeof(name##_papers) / sizeof(paper_t),	\
-  name##_papers					\
+static stp_mxml_node_t *
+get_media_size_xml(const stp_vars_t *v)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->media_sizes;
 }
 
-#define DECLARE_PAPER_ADJUSTMENTS(name)					\
-static const paper_adjustment_list_t name##_paper_adjustment_list =	\
-{									\
-  #name,								\
-  sizeof(name##_adjustments) / sizeof(paper_adjustment_t),		\
-  name##_adjustments							\
+int
+stp_escp2_load_media_sizes(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *sizes =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (sizes)
+	{
+	  stp_mxml_node_t **xnode =
+	    (stp_mxml_node_t **) &(printdef->media_sizes);
+	  *xnode = sizes;
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load media sizes from %s!\n", name);
+      stp_abort();
+    }
+  return found;
 }
 
-static const paper_adjustment_t standard_adjustments[] =
-{
-  { "Plain", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 0.83, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 1.00, .75, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 1.00, .75, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.85, .8, 1.0, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 1.0, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 0.85, .5, 1, .10, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.10, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", 1.10, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", 1.00, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", 1.0, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", 1.00, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 0.615, .5, 1, .075, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(standard);
-
-static const paper_adjustment_t photo_adjustments[] =
-{
-  { "Plain", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 0.83, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 1.00, 1.0, 1, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 1.00, .75, 1, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 1.00, .75, 1, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.85, .8, 1.0, .2, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 1.0, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 0.85, .375, 1, .2, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.10, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", 1.00, 1.00, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", 1.10, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", 1.00, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", 1.00, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", 1.00, 1.0, 1, .35, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", 1.0, 1.0, 1, .35, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", 1.00, 1.0, 1, .35, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 0.615, .25, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(photo);
-
-static const paper_adjustment_t photo2_adjustments[] =
-{
-  { "Plain", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1.0,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "PlainFast", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1.0,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Postcard", 0.83, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1.0,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "GlossyFilm", 1.00, 1.0, 0.5, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Transparency", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Envelope", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "BackFilm", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Matte", 0.85, 1.0, 0.4, .3, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "MatteHeavy", 0.85, 1.0, .3, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Inkjet", 0.85, 1.0, 0.5, .15, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Coated", 1.2, 1.0, .25, .15, .999, .89, 1, 1, .9, 1, 1.,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Photo", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "GlossyPhoto", 1.0, 1.0, 0.5, .3, .999, .9, .98, 1, .9, 1, 0.92,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Semigloss", 1.0, 1.0, 0.5, .3, .999, .9, .98, 1, .9, 1, 0.92,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Luster", 1.0, 1.0, 0.5, .3, .999, .9, .98, 1, .9, 1, 0.92,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "GlossyPaper", 1.00, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Ilford", .85, 1.0, 0.25, .2, .999, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj  },
-  { "ColorLife", 1.00, 1.0, 0.25, .2, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-  { "Other", 0.738, 1.0, 0.5, .1, .9, 1, 1, 1, 1, 1, 1,
-    photo2_hue_adj, photo2_lum_adj, photo2_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(photo2);
-
-static const paper_adjustment_t photo3_adjustments[] =
-{
-  { "Plain",        0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "PlainFast",    0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Postcard",     0.692, .35, 0.5, .2, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyFilm",   0.833, .5, 0.75, .2, .999, 1, .7, .8, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Transparency", 0.833, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Envelope",     0.615, .35, 0.75, .15, .9, 1, .85, .85, .9, 1, 1.0,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "BackFilm",     0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Matte",        0.833, .35, 0.5, .25, .999, 1, .67, .72, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "MatteHeavy",   0.833, .35, 0.5, .25, .999, 1, .85, .85, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Inkjet",       0.709, .5, 0.75, .2, .9, 1, .85, .85, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Coated",       0.833, .45, 0.5, .25, .999, 1, .76, .84, .66, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Photo",        0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPhoto",  0.75, .5, 0.3, .25, 1.05, 1, .85, .85, .66, 1, 0.92,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Semigloss",    0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Luster",       0.75, .5, 0.3, .25, .999, 1, .85, .85, .66, 1, 0.92,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPaper",  0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Ilford",       0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj  },
-  { "ColorLife",    0.833, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Other",        0.615, .35, 0.5, .5, .9, 1, .85, .85, .9, 1, 1,
-    photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(photo3);
-
-static const paper_adjustment_t claria_adjustments[] =
-{
-  { "Plain",        0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "PlainFast",    0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Postcard",     0.692, .25, 0.5, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "GlossyFilm",   0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Transparency", 0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Envelope",     0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "BackFilm",     0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Matte",        0.833, .25, 0.6, .15, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "MatteHeavy",   0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Inkjet",       0.709, .25, 0.75, .15, .75, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Coated",       0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Photo",        0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "GlossyPhoto",  0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Semigloss",    0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Luster",       0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "GlossyPaper",  0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Ilford",       0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj  },
-  { "ColorLife",    0.833, .25, 0.75, .2, .9, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-  { "Other",        0.540, .25, 0.5, .1, .5, 1, .7, .7, 1, 1, 1,
-    claria_hue_adj, claria_lum_adj, claria_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(claria);
-
-static const paper_adjustment_t sp960_adjustments[] =
-{
-  { "Plain",        0.86, .2,  0.4, .1,   .9,   .9, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "PlainFast",    0.86, .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Postcard",     0.90, .2,  0.4, .1,   .9,   .9, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "GlossyFilm",   0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Transparency", 0.9,  .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Envelope",     0.86, .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "BackFilm",     0.9,  .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Matte",        0.9,  .25, 0.4, .2,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "MatteHeavy",   0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Inkjet",       0.9,  .2,  0.4, .15,  .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Coated",       0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Photo",        0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "GlossyPhoto",  0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_hue_adj, sp960_lum_adj, sp960_sat_adj },
-  { "Semigloss",    0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_hue_adj, sp960_lum_adj, sp960_sat_adj },
-  { "Luster",       0.9,  .3,  0.4, .2,   .999, 1, 1, 1, 1, 1, 1,
-    sp960_hue_adj, sp960_lum_adj, sp960_sat_adj },
-  { "GlossyPaper",  0.9,  .3,  0.4, .15,  .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Ilford",       0.85, .3,  0.4, .15, 1.35,  1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj  },
-  { "ColorLife",    0.9,  .3,  0.4, .15,  .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-  { "Other",        0.86, .2,  0.4, .1,   .9,   1, 1, 1, 1, 1, 1,
-    sp960_matte_hue_adj, sp960_matte_lum_adj, sp960_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(sp960);
-
-static const paper_adjustment_t ultrachrome_photo_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Matte", 0.92, 0.4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Inkjet", 0.72, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Coated", 0.83, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Photo", 1.0, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, .4, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Other", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_photo);
-
-static const paper_adjustment_t ultrachrome_matte_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Transparency", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "BackFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Matte", 0.92, 0.4, 1, 0.00, 1.25, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, .4, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Inkjet", 0.72, .3, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Coated", 0.83, .4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Photo", 1.0, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, 1, .92,
-    ultra_glossy_hue_adj, ultra_glossy_lum_adj, ultra_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-  { "Other", 0.72, .1, .4, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
-    ultra_matte_hue_adj, ultra_matte_lum_adj, ultra_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_matte);
-
-static const paper_adjustment_t ultrachrome_k3_photo_adjustments[] =
-{
-  { "Plain", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "PlainFast", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Postcard", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Envelope", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Matte", 0.92, 0.8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Inkjet", 0.72, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Coated", 0.83, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Photo", 1.0, .5, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPhoto", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .01, 1.8, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, .8, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Other", 0.72, .1, 1, .01, 1.5, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo);
-
-static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "PlainFast", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Postcard", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Transparency", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Envelope", 0.72, .1, 1, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "BackFilm", 0.83, .5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.5, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Inkjet", 0.72, .3, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Coated", 0.83, .4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Photo", 1.0, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPhoto", 0.72, 1, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Semigloss", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "Luster", 0.72, .8, 1, .00, 1.25, 1, .95, .9, 1, 1, .92,
-    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, 1, .00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, 1, 0.00, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-  { "Other", 0.72, .1, .4, 0, 1.25, 1, .95, .9, 1, 1, 1.0,
-    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_matte);
-
-static const paper_adjustment_t r800_photo_adjustments[] =
-{
-  { "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "PlainFast", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Postcard", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Transparency", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Envelope", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Matte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "MatteHeavy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Glossy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyHeavy", 0.92, 0.4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Inkjet", 0.72, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Coated", 0.83, .5, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Photo", 1.0, .75, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPhoto", 0.600, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.600, .8, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalGlossy", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "WaterColorRadiant", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, .4, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "GlossyPaper", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Ilford", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj  },
-  { "ColorLife", 0.83, 1.0, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.72, .1, 1, .02, 1.4, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(r800_photo);
-
-static const paper_adjustment_t r800_matte_adjustments[] =
-{
-  { "Plain", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "PlainFast", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Postcard", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Transparency", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Envelope", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "BackFilm", 0.83, .5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Matte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "MatteHeavy", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Inkjet", 0.72, .3, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Coated", 0.83, .4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Photo", 1.0, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyPhoto", 0.546, 1, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Semigloss", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Luster", 0.546, .8, .5, .025, .999, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "ArchivalMatte", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "WaterColorRadiant", 0.92, 0.4, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "GlossyPaper", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Ilford", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj  },
-  { "ColorLife", 0.83, 0.5, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-  { "Other", 0.72, .1, .5, .025, .999, .882, 1, .250, 1, 1, 1.0,
-    r800_matte_hue_adj, r800_matte_lum_adj, r800_matte_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(r800_matte);
-
-static const paper_adjustment_t picturemate_6_adjustments[] =
-{
-  { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(picturemate_6);
-
-static const paper_adjustment_t picturemate_4_adjustments[] =
-{
-  { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-  { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0,
-    r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(picturemate_4);
-
-static const paper_adjustment_t durabrite_adjustments[] =
-{
-  { "Plain", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 0.8, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1.1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.0, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1.1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", .833, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", .833, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", .833, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(durabrite);
-
-static const paper_adjustment_t durabrite2_adjustments[] =
-{
-  { "Plain", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "PlainFast", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Postcard", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyFilm", 0.8, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Transparency", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Envelope", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "BackFilm", 0.8, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Matte", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "MatteHeavy", 0.9, .5, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Inkjet", 1.0, .5, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Coated", 1.0, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Photo", .833, .5, .5, .075, .999, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPhoto", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Semigloss", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Luster", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, .92,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "GlossyPaper", .833, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Ilford", .833, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj  },
-  { "ColorLife", .833, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-  { "Other", 1.0, .5, 1, .05, .9, 1, 1, 1, 1, 1, 1,
-    standard_hue_adj, standard_lum_adj, standard_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(durabrite2);
-
-static const paper_adjustment_t durabrite3_adjustments[] =
-{
-  { "Plain", 0.72, .5, .75, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "PlainFast", 0.72, .75, .5, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Postcard", 0.72, .75, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "GlossyFilm", 0.83, 1.0, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Transparency", 0.83, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Envelope", 0.72, .75, 1, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "BackFilm", 0.83, .75, 1, .05, .999, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Matte", 0.92, .5, .85, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "MatteHeavy", 0.92, .85, .5, .075, .999, 1, .975, .975, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Inkjet", 0.72, .5, .85, .05, .9, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Coated", 0.83, .5, .85, .075, .999, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Photo", 1.0, .5, .85, .075, .999, 1, .8, .8, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "GlossyPhoto", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Semigloss", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, .92,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Luster", 1.0, 1.0, 1, .15, .999, 1, .8, .8, 1, 1, .92,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "GlossyPaper", .83, 1.0, 1, .15, .999, 1, 1, 1, 1, 1, 1.0,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Ilford", .83, 1.0, 1, .15, 1.35, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj  },
-  { "ColorLife", .83, 1.0, 1, .15, .9, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-  { "Other", 0.72, .5, .75, .05, .9, 1, 1, 1, 1, 1, 1,
-    durabrite3_hue_adj, durabrite3_lum_adj, durabrite3_sat_adj },
-};
-
-DECLARE_PAPER_ADJUSTMENTS(durabrite3);
-
-static const paper_t standard_papers[] =
-{
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, NULL },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PREMIUM_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-};
-
-DECLARE_PAPERS(standard);
-
-static const paper_t durabrite_papers[] =
-{
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, NULL },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, "RGB", NULL },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, "RGB", NULL },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, "RGB", NULL },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, "RGB", NULL },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, "RGB", NULL },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-};
-
-DECLARE_PAPERS(durabrite);
-
-static const paper_t ultrachrome_papers[] =
-{
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraMatte" },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-};
-
-DECLARE_PAPERS(ultrachrome);
+void
+stp_escp2_set_media_size(stp_vars_t *v, const stp_vars_t *src)
+{
+  const char *name = stp_get_string_parameter(src, "PageSize");
+  if (name)
+    {
+      stp_mxml_node_t *node = get_media_size_xml(src);
+      stp_mxml_node_t *xnode = stp_mxmlFindElement(node, node, "MediaSize",
+						   "name", name, STP_MXML_DESCEND);
+      if (xnode)
+	{
+	  stp_vars_fill_from_xmltree_ref(xnode->child, node, v);
+	  return;
+	}
+      xnode = stp_mxmlFindElement(node, node, "MediaSize", "type", "default",
+				  STP_MXML_DESCEND);
+      if (xnode)
+	{
+	  stp_vars_fill_from_xmltree_ref(xnode->child, node, v);
+	  return;
+	}
+    }
+}
 
-static const paper_t ultrachrome_k3_papers[] =
+static const char *
+paper_namefunc(const void *item)
 {
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "UltraMatte" },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
-};
+  const paper_t *p = (const paper_t *) (item);
+  return p->cname;
+}
 
-DECLARE_PAPERS(ultrachrome_k3);
+int
+stp_escp2_load_media(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *media =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (media)
+	{
+	  stp_mxml_node_t **xnode =
+	    (stp_mxml_node_t **) &(printdef->media);
+	  stp_list_t **xlist =
+	    (stp_list_t **) &(printdef->media_cache);
+	  stp_string_list_t **xpapers =
+	    (stp_string_list_t **) &(printdef->papers);
+	  stp_mxml_node_t *node = stp_mxmlFindElement(media, media,
+						      "escp2:papers", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  *xnode = media;
+	  *xlist = stp_list_create();
+	  stp_list_set_namefunc(*xlist, paper_namefunc);
+	  *xpapers = stp_string_list_create();
+	  if (node)
+	    {
+	      node = node->child;
+	      while (node)
+		{
+		  if (node->type == STP_MXML_ELEMENT &&
+		      strcmp(node->value.element.name, "paper") == 0)
+		    stp_string_list_add_string(*xpapers,
+					       stp_mxmlElementGetAttr(node, "name"),
+					       stp_mxmlElementGetAttr(node, "text"));
+		  node = node->next;
+		}
+	    }
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load media from %s!\n", name);
+      stp_abort();
+    }
+  return found;
+}
 
-static const paper_t durabrite2_papers[] =
+static stp_mxml_node_t *
+get_media_xml(const stp_vars_t *v)
 {
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, NULL },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, NULL },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, NULL },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, NULL },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, NULL },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, NULL },
-};
-
-DECLARE_PAPERS(durabrite2);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->media;
+}
 
-static const paper_t r800_papers[] =
+static stp_list_t *
+get_media_cache(const stp_vars_t *v)
 {
-  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
-    1, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
-    5, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "Postcard", N_("Postcard"), PAPER_PLAIN,
-    2, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
-    3, 0, 0x6d, 0x00, 0x01, NULL, "r800Photo" },
-  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
-    3, 0, 0x6d, 0x00, 0x02, NULL, "r800Photo" },
-  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
-    4, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
-    6, 0, 0x6d, 0x00, 0x01, NULL, "r800Photo" },
-  { "Matte", N_("Matte Paper"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
-    7, 0, 0x6b, 0x1a, 0x01, NULL, "r800Photo" },
-  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "r800Photo" },
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Photo" },
-  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Photo" },
-  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Photo" },
-  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
-    7, 0, 0x00, 0x00, 0x02, NULL, "r800Matte" },
-  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
-    6, 0, 0x6b, 0x1a, 0x01, NULL, "r800Photo" },
-  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "r800Matte" },
-  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x67, 0x00, 0x02, NULL, "r800Photo" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "r800Matte" },
-};
-
-DECLARE_PAPERS(r800);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->media_cache;
+}
 
-static const paper_t picturemate_papers[] =
+int
+stp_escp2_has_media_feature(const stp_vars_t *v, const char *name)
 {
-  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
-    8, 0, 0x80, 0x00, 0x02, NULL, "picturematePhoto" },
-  { "Other", N_("Other"), PAPER_PLAIN,
-    0, 0, 0x6b, 0x1a, 0x01, NULL, "picturemateMatte" },
-};
+  stp_mxml_node_t *doc = get_media_xml(v);
+  if (doc)
+    return (stp_mxmlFindElement(doc, doc, "feature", "name", name,
+				STP_MXML_DESCEND) != NULL);
+  else
+    return 0;
+}
 
-DECLARE_PAPERS(picturemate);
 
-typedef struct
-{
-  const char *name;
-  const paperlist_t *paper_list;
-} paperl_t;
+static paper_t *
+build_media_type(const stp_vars_t *v, const char *name, const inklist_t *ink,
+		 const res_t *res)
+{
+  stp_mxml_node_t *node;
+  stp_mxml_node_t *doc = get_media_xml(v);
+  const char *pclass;
+  paper_t *answer;
+  stp_vars_t *vv = stp_vars_create();
+  if (!doc)
+    return NULL;
+  node = stp_mxmlFindElement(doc, doc, "paper", "name", name, STP_MXML_DESCEND);
+  if (!node)
+    return NULL;
+  answer = stp_zalloc(sizeof(paper_t));
+  answer->name = stp_mxmlElementGetAttr(node, "name");
+  answer->text = gettext(stp_mxmlElementGetAttr(node, "text"));
+  pclass = stp_mxmlElementGetAttr(node, "class");
+  answer->v = vv;
+  if (! pclass || strcasecmp(pclass, "plain") == 0)
+    answer->paper_class = PAPER_PLAIN;
+  else if (strcasecmp(pclass, "good") == 0)
+    answer->paper_class = PAPER_GOOD;
+  else if (strcasecmp(pclass, "photo") == 0)
+    answer->paper_class = PAPER_PHOTO;
+  else if (strcasecmp(pclass, "premium") == 0)
+    answer->paper_class = PAPER_PREMIUM_PHOTO;
+  else if (strcasecmp(pclass, "transparency") == 0)
+    answer->paper_class = PAPER_TRANSPARENCY;
+  else
+    answer->paper_class = PAPER_PLAIN;
+  answer->preferred_ink_type = stp_mxmlElementGetAttr(node, "PreferredInktype");
+  answer->preferred_ink_set = stp_mxmlElementGetAttr(node, "PreferredInkset");
+  stp_vars_fill_from_xmltree_ref(node->child, doc, vv);
+  if (ink && ink->name)
+    {
+      stp_mxml_node_t *inknode = stp_mxmlFindElement(node, node, "ink",
+						     "name", ink->name,
+						     STP_MXML_DESCEND);
+      if (inknode)
+	stp_vars_fill_from_xmltree_ref(inknode->child, doc, vv);
+      else
+	{
+	  stp_erprintf("Cannot find ink %s for media %s, model %s!\n",
+		       ink->name, name, stp_get_driver(v));
+	  stp_abort();
+	}
+    }
+  if (res && res->name)
+    {
+      stp_mxml_node_t *resnode = stp_mxmlFindElement(node, node, "resolution",
+						     "name", res->name,
+						     STP_MXML_DESCEND);
+      if (resnode)
+	stp_vars_fill_from_xmltree_ref(resnode->child, doc, vv);
+    }
+  return answer;
+}
 
-static const paperl_t the_papers[] =
+static char *
+build_media_id(const char *name, const inklist_t *ink, const res_t *res)
 {
-  { "standard", &standard_paper_list },
-  { "durabrite", &durabrite_paper_list },
-  { "durabrite2", &durabrite2_paper_list },
-  { "ultrachrome", &ultrachrome_paper_list },
-  { "ultrachrome_k3", &ultrachrome_k3_paper_list },
-  { "r800", &r800_paper_list },
-  { "picturemate", &picturemate_paper_list },
-};
+  char *answer;
+  stp_asprintf(&answer, "%s %s %s",
+	       name,
+	       ink ? ink->name : "",
+	       res ? res->name : "");
+  return answer;
+}
 
-const paperlist_t *
-stpi_escp2_get_paperlist_named(const char *n)
+static const paper_t *
+get_media_type_named(const stp_vars_t *v, const char *name,
+		     int ignore_res)
 {
+  paper_t *answer = NULL;
   int i;
-  if (n)
-    for (i = 0; i < sizeof(the_papers) / sizeof(paperl_t); i++)
-      {
-	if (strcmp(n, the_papers[i].name) == 0)
-	  return the_papers[i].paper_list;
-      }
-  return NULL;
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->papers;
+  const res_t *res = ignore_res ? NULL : stp_escp2_find_resolution(v);
+  const inklist_t *inklist = stp_escp2_inklist(v);
+  char *media_id = build_media_id(name, inklist, res);
+  stp_list_t *cache = get_media_cache(v);
+  stp_list_item_t *li = stp_list_get_item_by_name(cache, media_id);
+  if (li)
+    {
+      stp_free(media_id);
+      answer = (paper_t *) stp_list_item_get_data(li);
+    }
+  else
+    {
+      int paper_type_count = stp_string_list_count(p);
+      for (i = 0; i < paper_type_count; i++)
+	{
+	  if (!strcmp(name, stp_string_list_param(p, i)->name))
+	    {
+#ifdef HAVE_LOCALE_H
+	      char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+	      setlocale(LC_ALL, "C");
+#endif
+	      answer = build_media_type(v, name, inklist, res);
+#ifdef HAVE_LOCALE_H
+	      setlocale(LC_ALL, locale);
+	      stp_free(locale);
+#endif
+	      break;
+	    }
+	}
+      if (answer)
+	{
+	  answer->cname = media_id;
+	  stp_list_item_create(cache, NULL, answer);
+	}
+    }
+  return answer;
 }
 
-typedef struct
-{
-  const char *name;
-  const paper_adjustment_list_t *paper_list;
-} paperadj_t;
-
-static const paperadj_t the_adjustments[] =
-{
-  { "standard", &standard_paper_adjustment_list },
-  { "durabrite", &durabrite_paper_adjustment_list },
-  { "durabrite2", &durabrite2_paper_adjustment_list },
-  { "durabrite3", &durabrite3_paper_adjustment_list },
-  { "photo", &photo_paper_adjustment_list },
-  { "photo2", &photo2_paper_adjustment_list },
-  { "photo3", &photo3_paper_adjustment_list },
-  { "sp960", &sp960_paper_adjustment_list },
-  { "ultrachrome_photo", &ultrachrome_photo_paper_adjustment_list },
-  { "ultrachrome_matte", &ultrachrome_matte_paper_adjustment_list },
-  { "ultrachrome_k3_photo", &ultrachrome_k3_photo_paper_adjustment_list },
-  { "ultrachrome_k3_matte", &ultrachrome_k3_matte_paper_adjustment_list },
-  { "r800_photo", &r800_photo_paper_adjustment_list },
-  { "r800_matte", &r800_matte_paper_adjustment_list },
-  { "picturemate_4", &picturemate_4_paper_adjustment_list },
-  { "picturemate_6", &picturemate_6_paper_adjustment_list },
-  { "claria", &claria_paper_adjustment_list },
-};
-
-const paper_adjustment_list_t *
-stpi_escp2_get_paper_adjustment_list_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_adjustments) / sizeof(paperadj_t); i++)
-      {
-	if (strcmp(n, the_adjustments[i].name) == 0)
-	  return the_adjustments[i].paper_list;
-      }
+const paper_t *
+stp_escp2_get_media_type(const stp_vars_t *v, int ignore_res)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->papers;
+  if (p)
+    {
+      const char *name = stp_get_string_parameter(v, "MediaType");
+      if (name)
+	return get_media_type_named(v, name, ignore_res);
+    }
   return NULL;
 }
 
-
-#define DECLARE_INPUT_SLOT(name)				\
-static const input_slot_list_t name##_input_slot_list =		\
-{								\
-  #name,							\
-  name##_input_slots,						\
-  sizeof(name##_input_slots) / sizeof(const input_slot_t),	\
+const paper_t *
+stp_escp2_get_default_media_type(const stp_vars_t *v)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->papers;
+  if (p)
+    {
+      int paper_type_count = stp_string_list_count(p);
+      if (paper_type_count >= 0)
+	return get_media_type_named(v, stp_string_list_param(p, 0)->name, 1);
+    }
+  return NULL;
 }
 
-static const input_slot_t standard_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(standard_roll_feed);
-
-static const input_slot_t cutter_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "RollCutPage",
-    N_("Roll Feed (cut each page)"),
-    0,
-    1,
-    ROLL_FEED_CUT_ALL,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "RollCutNone",
-    N_("Roll Feed (do not cut)"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cutter_roll_feed);
-
-static const input_slot_t cd_cutter_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Manual",
-    N_("Manual Feed"),
-    0,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "RollCutPage",
-    N_("Roll Feed (cut each page)"),
-    0,
-    1,
-    ROLL_FEED_CUT_ALL,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "RollCutNone",
-    N_("Roll Feed (do not cut)"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cd_cutter_roll_feed);
-
-static const input_slot_t cd_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Manual",
-    N_("Manual Feed"),
-    0,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cd_roll_feed);
-
-static const input_slot_t r2400_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Velvet",
-    N_("Manual Sheet Guide"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Matte",
-    N_("Manual Feed (Front)"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(r2400);
-
-static const input_slot_t r1800_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Velvet",
-    N_("Manual Sheet Guide"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Matte",
-    N_("Manual Feed (Front)"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-};
-
-DECLARE_INPUT_SLOT(r1800);
 
-static const input_slot_t rx700_input_slots[] =
+static const char *
+slots_namefunc(const void *item)
 {
-  {
-    "Rear",
-    N_("Rear Tray"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Front",
-    N_("Front Tray"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "PhotoBoard",
-    N_("Photo Board"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-};
+  const input_slot_t *p = (const input_slot_t *) (item);
+  return p->name;
+}
 
-DECLARE_INPUT_SLOT(rx700);
+int
+stp_escp2_load_input_slots(const stp_vars_t *v, const char *name)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *slots =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (slots)
+	{
+	  stp_mxml_node_t **xnode =
+	    (stp_mxml_node_t **) &(printdef->slots);
+	  stp_list_t **xlist =
+	    (stp_list_t **) &(printdef->slots_cache);
+	  stp_string_list_t **xslots =
+	    (stp_string_list_t **) &(printdef->input_slots);
+	  stp_mxml_node_t *node = stp_mxmlFindElement(slots, slots,
+						      "escp2:InputSlots", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  *xnode = slots;
+	  *xlist = stp_list_create();
+	  stp_list_set_namefunc(*xlist, slots_namefunc);
+	  *xslots = stp_string_list_create();
+	  if (node)
+	    {
+	      node = node->child;
+	      while (node)
+		{
+		  if (node->type == STP_MXML_ELEMENT &&
+		      strcmp(node->value.element.name, "slot") == 0)
+		    stp_string_list_add_string(*xslots,
+					       stp_mxmlElementGetAttr(node, "name"),
+					       stp_mxmlElementGetAttr(node, "text"));
+		  node = node->next;
+		}
+	    }
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load input slots from %s!\n", name);
+      stp_abort();
+    }
+  return found;
+}
 
-static const input_slot_t pro_roll_feed_input_slots[] =
+static stp_mxml_node_t *
+get_slots_xml(const stp_vars_t *v)
 {
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\000" },
-    { 0, "" }
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    0,
-    { 7, "PP\003\000\000\003\000" },
-    { 0, "" }
-  }
-};
-
-DECLARE_INPUT_SLOT(pro_roll_feed);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->slots;
+}
 
-static const input_slot_t spro5000_input_slots[] =
+static stp_list_t *
+get_slots_cache(const stp_vars_t *v)
 {
-  {
-    "CutSheet1",
-    N_("Cut Sheet Bin 1"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\001\001" },
-    { 0, "" }
-  },
-  {
-    "CutSheet2",
-    N_("Cut Sheet Bin 2"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\001" },
-    { 0, "" }
-  },
-  {
-    "CutSheetAuto",
-    N_("Cut Sheet Autoselect"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\001\377" },
-    { 0, "" }
-  },
-  {
-    "ManualSelect",
-    N_("Manual Selection"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\001" },
-    { 0, "" }
-  }
-};
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->slots_cache;
+}
 
-DECLARE_INPUT_SLOT(spro5000);
+static input_slot_t *
+build_input_slot(const stp_vars_t *v, const char *name)
+{
+  stp_mxml_node_t *node, *n1;
+  stp_mxml_node_t *doc = get_slots_xml(v);
+  input_slot_t *answer;
+  if (!doc)
+    return NULL;
+  node = stp_mxmlFindElement(doc, doc, "slot", "name", name, STP_MXML_DESCEND);
+  if (!node)
+    return NULL;
+  answer = stp_zalloc(sizeof(input_slot_t));
+  answer->name = stp_mxmlElementGetAttr(node, "name");
+  answer->text = gettext(stp_mxmlElementGetAttr(node, "text"));
+  n1 = stp_mxmlFindElement(node, node, "CD", NULL, NULL, STP_MXML_DESCEND);
+  if (n1)
+    answer->is_cd = 1;
+  n1 = stp_mxmlFindElement(node, node, "RollFeed", NULL, NULL, STP_MXML_DESCEND);
+  if (n1)
+    {
+      answer->is_roll_feed = 1;
+      if (stp_mxmlFindElement(n1, n1, "CutAll", NULL, NULL, STP_MXML_DESCEND))
+	answer->roll_feed_cut_flags |= ROLL_FEED_CUT_ALL;
+      if (stp_mxmlFindElement(n1, n1, "CutLast", NULL, NULL, STP_MXML_DESCEND))
+	answer->roll_feed_cut_flags |= ROLL_FEED_CUT_LAST;
+      if (stp_mxmlFindElement(n1, n1, "DontEject", NULL, NULL, STP_MXML_DESCEND))
+	answer->roll_feed_cut_flags |= ROLL_FEED_DONT_EJECT;
+    }
+  n1 = stp_mxmlFindElement(node, node, "Duplex", NULL, NULL, STP_MXML_DESCEND);
+  if (n1)
+    {
+      if (stp_mxmlFindElement(n1, n1, "Tumble", NULL, NULL, STP_MXML_DESCEND))
+	answer->duplex |= DUPLEX_TUMBLE;
+      if (stp_mxmlFindElement(n1, n1, "NoTumble", NULL, NULL, STP_MXML_DESCEND))
+	answer->duplex |= DUPLEX_NO_TUMBLE;
+    }
+  n1 = stp_mxmlFindElement(node, node, "InitSequence", NULL, NULL, STP_MXML_DESCEND);
+  if (n1 && n1->child && n1->child->type == STP_MXML_TEXT)
+    answer->init_sequence = stp_xmlstrtoraw(n1->child->value.text.string);
+  n1 = stp_mxmlFindElement(node, node, "DeinitSequence", NULL, NULL, STP_MXML_DESCEND);
+  if (n1 && n1->child && n1->child->type == STP_MXML_TEXT)
+    answer->deinit_sequence = stp_xmlstrtoraw(n1->child->value.text.string);
+  return answer;
+}
 
-static const input_slot_list_t default_input_slot_list =
+int
+stp_escp2_printer_supports_rollfeed(const stp_vars_t *v)
 {
-  "Standard",
-  NULL,
-  0,
-};
+  stp_mxml_node_t *node = get_slots_xml(v);
+  if (stp_mxmlFindElement(node, node, "RollFeed", NULL, NULL, STP_MXML_DESCEND))
+    return 1;
+  else
+    return 0;
+}
 
-typedef struct
+int
+stp_escp2_printer_supports_print_to_cd(const stp_vars_t *v)
 {
-  const char *name;
-  const input_slot_list_t *input_slots;
-} inslot_t;
+  stp_mxml_node_t *node = get_slots_xml(v);
+  if (stp_mxmlFindElement(node, node, "CD", NULL, NULL, STP_MXML_DESCEND))
+    return 1;
+  else
+    return 0;
+}
 
-static const inslot_t the_slots[] =
+int
+stp_escp2_printer_supports_duplex(const stp_vars_t *v)
 {
-  { "cd_cutter_roll_feed", &cd_cutter_roll_feed_input_slot_list },
-  { "cd_roll_feed", &cd_roll_feed_input_slot_list },
-  { "cutter_roll_feed", &cutter_roll_feed_input_slot_list },
-  { "default", &default_input_slot_list },
-  { "pro_roll_feed", &pro_roll_feed_input_slot_list },
-  { "r1800", &r1800_input_slot_list },
-  { "r2400", &r2400_input_slot_list },
-  { "rx700", &rx700_input_slot_list },
-  { "spro5000", &spro5000_input_slot_list },
-  { "standard_roll_feed", &standard_roll_feed_input_slot_list },
-};
+  stp_mxml_node_t *node = get_slots_xml(v);
+  if (stp_mxmlFindElement(node, node, "Duplex", NULL, NULL, STP_MXML_DESCEND))
+    return 1;
+  else
+    return 0;
+}
 
-const input_slot_list_t *
-stpi_escp2_get_input_slot_list_named(const char *n)
+static const input_slot_t *
+get_input_slot_named(const stp_vars_t *v, const char *name)
 {
+  input_slot_t *answer = NULL;
   int i;
-  if (n)
-    for (i = 0; i < sizeof(the_slots) / sizeof(inslot_t); i++)
-      {
-	if (strcmp(n, the_slots[i].name) == 0)
-	  return the_slots[i].input_slots;
-      }
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->input_slots;
+  stp_list_t *cache = get_slots_cache(v);
+  stp_list_item_t *li = stp_list_get_item_by_name(cache, name);
+  if (li)
+    answer = (input_slot_t *) stp_list_item_get_data(li);
+  else
+    {
+      int slot_count = stp_string_list_count(p);
+      for (i = 0; i < slot_count; i++)
+	{
+	  if (!strcmp(name, stp_string_list_param(p, i)->name))
+	    {
+#ifdef HAVE_LOCALE_H
+	      char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+	      setlocale(LC_ALL, "C");
+#endif
+	      answer = build_input_slot(v, name);
+#ifdef HAVE_LOCALE_H
+	      setlocale(LC_ALL, locale);
+	      stp_free(locale);
+#endif
+	      break;
+	    }
+	}
+      if (answer)
+	stp_list_item_create(cache, NULL, answer);
+    }
+  return answer;
+}
+
+const input_slot_t *
+stp_escp2_get_input_slot(const stp_vars_t *v)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  const stp_string_list_t *p = printdef->input_slots;
+  if (p)
+    {
+      const char *name = stp_get_string_parameter(v, "InputSlot");
+      if (name)
+	return get_input_slot_named(v, name);
+    }
   return NULL;
 }
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 76d8313..6ca9f3c 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.44 2008/02/24 04:08:05 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.51 2008/07/06 02:17:43 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -29,690 +29,307 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "print-escp2.h"
 
-static const res_t r_360x90dpi =
-{ "360x90dpi",     N_("360 x 90 DPI Fast Economy"),
-  360,  90,  360,  90,  360,  90,   0, 0, 1 };
-static const res_t r_360x90sw =
-{ "360x90sw",      N_("360 x 90 DPI Fast Economy"),
-  360,  90,  360,  90,  360,  90,   1, 0, 1 };
 
-static const res_t r_360x120dpi =
-{ "360x120dpi",    N_("360 x 120 DPI Economy"),
-  360,  120,  360,  120,  360,  120,  0, 0, 1 };
-static const res_t r_360x120sw =
-{ "360x120sw",     N_("360 x 120 DPI Economy"),
-  360,  120,  360,  120,  360,  120,  1, 0, 1 };
-
-static const res_t r_180dpi =
-{ "180dpi",        N_("180 DPI Economy"),
-  180,  180,  180,  180,  180,  180,  0, 0, 1 };
-static const res_t r_180sw =
-{ "180sw",         N_("180 DPI Economy"),
-  180,  180,  180,  180,  180,  180,  1, 0, 1 };
-
-static const res_t r_360x180dpi =
-{ "360x180dpi",    N_("360 x 180 DPI Draft"),
-  360,  180,  360,  180,  360,  180,  0, 0, 1 };
-static const res_t r_360x180sw =
-{ "360x180sw",     N_("360 x 180 DPI Draft"),
-  360,  180,  360,  180,  360,  180,  1, 0, 1 };
-
-static const res_t r_360x240dpi =
-{ "360x240dpi",    N_("360 x 240 DPI Draft"),
-  360,  240,  360,  240,  360,  240,  0, 0, 1 };
-static const res_t r_360x240sw =
-{ "360x240sw",     N_("360 x 240 DPI Draft"),
-  360,  240,  360,  240,  360,  240,  1, 0, 1 };
-
-static const res_t r_360mw =
-{ "360mw",         N_("360 DPI High Quality"),
-  360,  360,  360,  360,  360,  360,  0, 1, 1 };
-static const res_t r_360pro =
-{ "360pro",        N_("360 DPI"),
-  360,  360,  360,  360,  360,  360,  0, 1, 1 };
-static const res_t r_360 =
-{ "360",           N_("360 DPI"),
-  360,  360,  360,  360,  360,  360,  0, 0, 1 };
-static const res_t r_360sw =
-{ "360sw",         N_("360 DPI"),
-  360,  360,  360,  360,  360,  360,  1, 0, 1 };
-
-static const res_t r_720x360mw =
-{ "720x360mw",     N_("720 x 360 DPI"),
-  720,  360,  720,  360,  720,  360,  0, 1, 1 };
-static const res_t r_720x360sw =
-{ "720x360sw",     N_("720 x 360 DPI"),
-  720,  360,  720,  360,  720,  360,  1, 0, 1 };
-static const res_t r_720x360un =
-{ "720x360un",     N_("720 x 360 DPI Enhanced"),
-  720,  360, 1440,  720,  720,  360,  1, 0, 1 };
-
-static const res_t r_720mw =
-{ "720mw",         N_("720 DPI"),
-  720,  720,  720,  720,  720,  720,  0, 1, 1 };
-static const res_t r_720sw =
-{ "720sw",         N_("720 DPI"),
-  720,  720,  720,  720,  720,  720,  1, 0, 1 };
-static const res_t r_720un =
-{ "720un",         N_("720 DPI High Quality"),
-  720,  720, 1440,  720,  720,  720,  1, 0, 1 };
-static const res_t r_720hq =
-{ "720hq",         N_("720 DPI High Quality"),
-  720,  720,  720,  720,  720,  720,  1, 0, 2 };
-static const res_t r_720hq2 =
-{ "720hq2",        N_("720 DPI Highest Quality"),
-  720,  720,  720,  720,  720,  720,  1, 0, 4 };
-static const res_t r_720x720oov =
-{ "720x720oov",    N_("720 x 720 DPI"),
-  2880, 720,  2880, 720,  720, 720,  1, 0, 1 };
-
-static const res_t r_1440x720mw =
-{ "1440x720mw",     N_("1440 x 720 DPI"),
-  1440, 720,  1440, 720,  1440, 720,  0, 1, 1 };
-static const res_t r_1440x720sw =
-{ "1440x720sw",    N_("1440 x 720 DPI"),
-  1440, 720,  1440, 720,  1440, 720,  1, 0, 1 };
-static const res_t r_1440x720hq2 =
-{ "1440x720hq2",   N_("1440 x 720 DPI Highest Quality"),
-  1440, 720,  1440, 720,  1440, 720,  1, 0, 2 };
-static const res_t r_720x1440sw =
-{ "720x1440sw",    N_("1440 x 720 DPI Transposed"),
-  720, 1440,  720, 1440,  720, 1440,  1, 0, 1 };
-static const res_t r_720x1440ov =
-{ "720x1440ov",   N_("1440 x 720 DPI Transposed"),
-  1440, 1440, 1440, 1440, 720, 1440,  1, 0, 1};
-static const res_t r_1440x720ov =
-{ "1440x720ov",    N_("1440 x 720 DPI"),
-  2880, 720,  2880, 720,  1440, 720,  1, 0, 1 };
-
-static const res_t r_2880x720mw =
-{ "2880x720mw",    N_("2880 x 720 DPI"),
-  2880, 720,  2880, 720,  2880, 720,  0, 1, 1};
-static const res_t r_2880x720sw =
-{ "2880x720sw",    N_("2880 x 720 DPI"),
-  2880, 720,  2880, 720,  2880, 720,  1, 0, 1};
-static const res_t r_2880x720hq2 =
-{ "2880x720hq2",   N_("2880 x 720 DPI Highest Quality"),
-  2880, 720,  2880, 720,  2880, 720,  1, 0, 2 };
-
-static const res_t r_1440x1440mw =
-{ "1440x1440mw",   N_("1440 x 1440 DPI"),
-  1440, 1440,  1440, 1440,  1440, 1440, 0, 1, 1};
-static const res_t r_1440x1440sw =
-{ "1440x1440sw",   N_("1440 x 1440 DPI"),
-  1440, 1440,  1440, 1440,  1440, 1440, 1, 0, 1};
-static const res_t r_1440x1440ov =
-{ "1440x1440ov",   N_("1440 x 1440 DPI"),
-  2880, 1440,  2880, 1440,  1440, 1440, 1, 0, 1};
-
-static const res_t r_2880x1440mw =
-{ "2880x1440mw",   N_("2880 x 1440 DPI"),
-  2880, 1440,  2880, 1440,  2880, 1440, 0, 1, 1};
-static const res_t r_2880x1440sw =
-{ "2880x1440sw",   N_("2880 x 1440 DPI"),
-  2880, 1440,  2880, 1440,  2880, 1440, 1, 0, 1};
-static const res_t r_1440x2880sw =
-{ "1440x2880sw",   N_("2880 x 1440 DPI Transposed"),
-  1440, 2880,  1440, 2880,  1440, 2880, 1, 0, 1};
-static const res_t r_2880x1440sw2400 =
-{ "2880x1440sw",   N_("2880 x 1440 DPI"),
-  1440, 2880,  1440, 2880,  1440, 2880, 1, 0, 1};
-
-static const res_t r_5760x1440sw =
-{ "5760x1440sw",   N_("5760 x 1440 DPI"),
-  5760, 1440,  5760, 1440,  5760, 1440, 1, 0, 1};
-
-static const res_t r_2880x2880mw =
-{ "2880x2880mw",   N_("2880 x 2880 DPI"),
-  2880, 2880,  2880, 2880,  2880, 2880, 0, 1, 1};
-static const res_t r_2880x2880sw =
-{ "2880x2880sw",   N_("2880 x 2880 DPI"),
-  2880, 2880,  2880, 2880,  2880, 2880, 1, 0, 1};
-
-static const res_t r_5760x2880mw =
-{ "5760x2880mw",   N_("5760 x 2880 DPI"),
-  5760, 2880,  5760, 2880,  5760, 2880, 0, 1, 1};
-static const res_t r_5760x2880sw =
-{ "5760x2880sw",   N_("5760 x 2880 DPI"),
-  5760, 2880,  5760, 2880,  5760, 2880, 1, 0, 1};
-
-
-
-static const res_t *const stpi_escp2_720dpi_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120dpi,
-
-  &r_180dpi,
-
-  &r_360x240dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720mw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_1440dpi_reslist[] =
+int
+stp_escp2_load_printer_weaves_from_xml(const stp_vars_t *v,
+				       stp_mxml_node_t *node)
 {
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_180sw,
-
-  &r_360x240sw,
-
-  &r_360x180sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_2880dpi_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_180sw,
-
-  &r_360x240sw,
-
-  &r_360x180sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  &r_2880x720sw,
-  &r_2880x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_180sw,
-
-  &r_360x240sw,
-
-  &r_360x180sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-
-  &r_1440x720sw,
-
-  &r_2880x720sw,
-
-  &r_1440x1440sw,
-
-  &r_2880x1440sw,
-
-  &r_2880x2880sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_g3_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120dpi,
-
-  &r_180dpi,
-
-  &r_360x240dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_superfine_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x120sw,
-
-  &r_360x180sw,
-
-  &r_360x240sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-
-  &r_1440x720sw,
-
-  &r_1440x1440ov,
-
-  &r_2880x1440sw,
-
-  &r_5760x1440sw,
-
-  &r_2880x2880sw,
-
-  &r_5760x2880sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_claria_1400_reslist[] =
-{
-  &r_360x90sw,
-
-  &r_360x180sw,
-
-  &r_360x240sw,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720x360un,
-
-  &r_720sw,
-
-  &r_720un,
-
-  &r_1440x720sw,
-
-  &r_1440x1440ov,
-
-  &r_2880x1440sw,
-
-  &r_5760x1440sw,
-
-  &r_2880x2880sw,
-
-  &r_5760x2880sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_picturemate_reslist[] =
-{
-
-  &r_720x720oov,
-
-  &r_1440x720ov,
-
-  &r_720x1440ov,
-
-  &r_1440x1440sw,
-
-  &r_2880x1440sw,
-
-  &r_5760x1440sw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_sc500_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120dpi,
-
-  &r_180dpi,
-
-  &r_360x240dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360mw,
-
-  &r_720mw,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_g3_720dpi_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120sw,
-
-  &r_180dpi,
-
-  &r_360x240sw,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-  &r_720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_720dpi_soft_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_360x120sw,
-
-  &r_180dpi,
-
-  &r_360x240sw,
-
-  &r_360x180dpi,
-
-  &r_360sw,
-
-  &r_720x360sw,
-
-  &r_720sw,
-  &r_720hq,
-  &r_720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_sc640_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_180dpi,
-
-  &r_360x180dpi,
-
-  &r_360mw,
-  &r_360,
-
-  &r_720x360sw,
-
-  &r_720mw,
-
-  &r_1440x720sw,
-  &r_1440x720hq2,
-
-  NULL
-};
-
-static const res_t *const stpi_escp2_pro_reslist[] =
-{
-  &r_360x90dpi,
-
-  &r_180dpi,
-
-  &r_360x180dpi,
-
-  &r_360pro,
-
-  &r_720x360mw,
-
-  &r_720mw,
-
-  &r_1440x720mw,
-
-  &r_2880x720mw,
-
-  &r_1440x1440mw,
-
-  &r_2880x1440mw,
-
-  &r_2880x2880mw,
-
-  NULL
-};
-
-typedef struct
-{
-  const char *name;
-  const res_t *const *const res_list;
-} resolution_t;
-
-static const resolution_t the_resolutions[] =
-{
-  { "superfine", stpi_escp2_superfine_reslist },
-  { "claria_1400", stpi_escp2_claria_1400_reslist },
-  { "pro", stpi_escp2_pro_reslist },
-  { "720dpi", stpi_escp2_720dpi_reslist },
-  { "720dpi_soft", stpi_escp2_720dpi_soft_reslist },
-  { "g3_720dpi", stpi_escp2_g3_720dpi_reslist },
-  { "1440dpi", stpi_escp2_1440dpi_reslist },
-  { "2880dpi", stpi_escp2_2880dpi_reslist },
-  { "2880_1440dpi", stpi_escp2_2880_1440dpi_reslist },
-  { "g3", stpi_escp2_g3_reslist },
-  { "sc500", stpi_escp2_sc500_reslist },
-  { "sc640", stpi_escp2_sc640_reslist },
-  { "picturemate", stpi_escp2_picturemate_reslist },
-};
-
-const res_t *const *
-stpi_escp2_get_reslist_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_resolutions) / sizeof(resolution_t); i++)
-      {
-	if (strcmp(n, the_resolutions[i].name) == 0)
-	  return the_resolutions[i].res_list;
-      }
-  return NULL;
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  printer_weave_list_t *xpw = stp_malloc(sizeof(printer_weave_list_t));
+  int count = 0;
+  stp_mxml_node_t *child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "weave"))
+	count++;
+      child = child->next;
+    }
+  printdef->printer_weaves = xpw;
+  if (stp_mxmlElementGetAttr(node, "name"))
+    xpw->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+  xpw->n_printer_weaves = count;
+  xpw->printer_weaves = stp_zalloc(sizeof(printer_weave_t) * count);
+  child = node->child;
+  count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "weave"))
+	{
+	  const char *wname = stp_mxmlElementGetAttr(child, "name");
+	  const char *wtext = stp_mxmlElementGetAttr(child, "text");
+	  const char *cmd = stp_mxmlElementGetAttr(child, "command");
+	  if (wname)
+	    xpw->printer_weaves[count].name = stp_strdup(wname);
+	  if (wtext)
+	    xpw->printer_weaves[count].text = stp_strdup(wtext);
+	  if (cmd)
+	    xpw->printer_weaves[count].command = stp_xmlstrtoraw(cmd);
+	  count++;
+	}
+      child = child->next;
+    }
+  return 1;
 }
 
-#define DECLARE_PRINTER_WEAVES(name)				\
-static const printer_weave_list_t name##_printer_weave_list =	\
-{								\
-  #name,							\
-  sizeof(name##_printer_weaves) / sizeof(printer_weave_t),	\
-  name##_printer_weaves						\
-}
-
-static const printer_weave_t standard_printer_weaves[] =
+int
+stp_escp2_load_printer_weaves(const stp_vars_t *v, const char *name)
 {
-  { "Off", N_("Off"), 0 },
-  { "On", N_("On"), 1 }
-};
-
-DECLARE_PRINTER_WEAVES(standard);
-
-static const printer_weave_t pro7000_printer_weaves[] =
-{
-  { "Off", N_("Off"), 0 },
-  { "On", N_("Interleave"), 1 },
-  { "FOL", N_("Full Overlap"), 2 },
-  { "FourPass", N_("Four Pass"), 3 },
-  { "FOL2", N_("Full Overlap 2"), 4 },
-};
-
-DECLARE_PRINTER_WEAVES(pro7000);
-
-static const printer_weave_t pro7500_printer_weaves[] =
-{
-  { "Off", N_("Off"), 0 },
-  { "On", N_("Interleave"), 1 },
-  { "FOL", N_("Full Overlap"), 2 },
-  { "FourPass", N_("Four Pass"), 3 },
-  { "FOL2", N_("Full Overlap 2"), 4 },
-  { "MW2", N_("Interleave 2"), 5 },
-};
-
-DECLARE_PRINTER_WEAVES(pro7500);
-
-static const printer_weave_t pro7600_printer_weaves[] =
-{
-  { "Off", N_("Off"), 0 },
-  { "On", N_("Interleave"), 1 },
-  { "FOL", N_("Full Overlap"), 2 },
-  { "FourPass", N_("Four Pass"), 3 },
-  { "FOL2", N_("Full Overlap 2"), 4 },
-  { "MW2", N_("Interleave 2"), 5 },
-  { "EightPass", N_("Eight Pass"), 6 },
-};
-
-DECLARE_PRINTER_WEAVES(pro7600);
-
-typedef struct
-{
-  const char *name;
-  const printer_weave_list_t *weave_list;
-} weave_t;
-
-static const weave_t the_weaves[] =
-{
-  { "standard", &standard_printer_weave_list },
-  { "pro7000", &pro7000_printer_weave_list },
-  { "pro7500", &pro7500_printer_weave_list },
-  { "pro7600", &pro7600_printer_weave_list },
-};
-
-const printer_weave_list_t *
-stpi_escp2_get_printer_weaves_named(const char *n)
-{
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_weaves) / sizeof(weave_t); i++)
-      {
-	if (strcmp(n, the_weaves[i].name) == 0)
-	  return the_weaves[i].weave_list;
-      }
-  return NULL;
-}
-
-
-#define DECLARE_QUALITY_LIST(name)			\
-static const quality_list_t name##_quality_list =	\
-{							\
-  #name,						\
-  name##_qualities,					\
-  sizeof(name##_qualities) / sizeof(const quality_t),	\
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *weaves =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (weaves)
+	{
+	  stp_mxml_node_t *node = stp_mxmlFindElement(weaves, weaves,
+						      "escp2:PrinterWeaves", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    stp_escp2_load_printer_weaves_from_xml(v, node);
+	  stp_mxmlDelete(weaves);
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load printer weaves from %s!\n", name);
+      stp_abort();
+    }
+  return found;
 }
 
-static const quality_t standard_qualities[] =
+int
+stp_escp2_load_resolutions_from_xml(const stp_vars_t *v, stp_mxml_node_t *node)
 {
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "Best",        N_("Best"),         720, 360, 0, 1440, -1, -1 },
-};
-
-DECLARE_QUALITY_LIST(standard);
-
-static const quality_t v2880_qualities[] =
-{
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
-  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
-};
-
-DECLARE_QUALITY_LIST(v2880);
-
-static const quality_t p1_5_qualities[] =
-{
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 1440, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "Best",        N_("Best"),         720, 360, 0, 1440, -1, -1 },
-};
-
-DECLARE_QUALITY_LIST(p1_5);
-
-static const quality_t picturemate_qualities[] =
-{
-  { "Draft",       N_("Draft"),        1440,  720, 1440,  720, 1440,  720 },
-  { "Standard",    N_("Standard"),     1440, 1440, 1440, 1440, 1440, 1440 },
-  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
-  { "High",        N_("High"),         2880, 1440, 2880, 1440, 2880, 1440 },
-  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  5760, 1440, 5760, 1440, 5760, 1440 },
-  { "Best",        N_("Best"),         5760, 1440, 5760, 1440, 5760, 1440 },
-};
-
-DECLARE_QUALITY_LIST(picturemate);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  resolution_list_t *xrs = stp_malloc(sizeof(resolution_list_t));
+  int count = 0;
+  stp_mxml_node_t *child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "resolution"))
+	count++;
+      child = child->next;
+    }
+  printdef->resolutions = xrs;
+  if (stp_mxmlElementGetAttr(node, "name"))
+    xrs->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+  xrs->n_resolutions = count;
+  xrs->resolutions = stp_zalloc(sizeof(res_t) * count);
+  child = node->child;
+  count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "resolution"))
+	{
+	  res_t *res = &(xrs->resolutions[count]);
+	  stp_mxml_node_t *cchild = child->child;
+	  const char *wname = stp_mxmlElementGetAttr(child, "name");
+	  const char *wtext = stp_mxmlElementGetAttr(child, "text");
+	  res->v = stp_vars_create();
+	  res->vertical_passes = 1;
+	  if (wname)
+	    res->name = stp_strdup(wname);
+	  if (wtext)
+	    res->text = stp_strdup(wtext);
+	  stp_vars_fill_from_xmltree_ref(cchild, node, res->v);
+	  while (cchild)
+	    {
+	      if (cchild->type == STP_MXML_ELEMENT)
+		{
+		  const char *elt = cchild->value.element.name;
+		  if (cchild->type == STP_MXML_ELEMENT &&
+		      (!strcmp(elt, "physicalResolution") ||
+		       !strcmp(elt, "printedResolution")))
+		    {
+		      long data[2] = { 0, 0 };
+		      stp_mxml_node_t *ccchild = cchild->child;
+		      data[0] = stp_xmlstrtol(ccchild->value.text.string);
+		      ccchild = ccchild->next;
+		      data[1] = stp_xmlstrtol(ccchild->value.text.string);
+		      if (!strcmp(elt, "physicalResolution"))
+			{
+			  res->hres = data[0];
+			  res->vres = data[1];
+			}			      
+		      else if (!strcmp(elt, "printedResolution"))
+			{
+			  res->printed_hres = data[0];
+			  res->printed_vres = data[1];
+			}			      
+		    }
+		  else if (!strcmp(elt, "verticalPasses") &&
+			   cchild->child &&
+			   cchild->child->type == STP_MXML_TEXT)
+		    res->vertical_passes = stp_xmlstrtol(cchild->child->value.text.string);
+		  else if (!strcmp(elt, "printerWeave") &&
+			   stp_mxmlElementGetAttr(cchild, "command"))
+		    res->command = stp_xmlstrtoraw(stp_mxmlElementGetAttr(cchild, "command"));
+		}
+	      cchild = cchild->next;
+	    }
+	  if (!res->printed_hres)
+	    res->printed_hres = res->hres;
+	  if (!res->printed_vres)
+	    res->printed_vres = res->vres;
+	  count++;
+	}
+      child = child->next;
+    }
+  return 1;
+}
 
-typedef struct
+int
+stp_escp2_load_resolutions(const stp_vars_t *v, const char *name)
 {
-  const char *name;
-  const quality_list_t *quality_list;
-} qual_t;
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *resolutions =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (resolutions)
+	{
+	  stp_mxml_node_t *node = stp_mxmlFindElement(resolutions, resolutions,
+						      "escp2:resolutions", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    stp_escp2_load_resolutions_from_xml(v, node);
+	  stp_mxmlDelete(resolutions);
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load resolutions from %s!\n", name);
+      stp_abort();
+    }
+  return found;
+}
 
-static const qual_t the_qualities[] =
+int
+stp_escp2_load_quality_presets_from_xml(const stp_vars_t *v, stp_mxml_node_t *node)
 {
-  { "standard", &standard_quality_list },
-  { "p1_5", &p1_5_quality_list },
-  { "picturemate", &picturemate_quality_list },
-  { "v2880", &v2880_quality_list },
-};
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  quality_list_t *qpw = stp_malloc(sizeof(quality_list_t));
+  int count = 0;
+  stp_mxml_node_t *child = node->child;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "quality"))
+	count++;
+      child = child->next;
+    }
+  printdef->quality_list = qpw;
+  if (stp_mxmlElementGetAttr(node, "name"))
+    qpw->name = stp_strdup(stp_mxmlElementGetAttr(node, "name"));
+  qpw->n_quals = count;
+  qpw->qualities = stp_zalloc(sizeof(quality_t) * count);
+  child = node->child;
+  count = 0;
+  while (child)
+    {
+      if (child->type == STP_MXML_ELEMENT &&
+	  !strcmp(child->value.element.name, "quality"))
+	{
+	  stp_mxml_node_t *cchild = child->child;
+	  const char *wname = stp_mxmlElementGetAttr(child, "name");
+	  const char *wtext = stp_mxmlElementGetAttr(child, "text");
+	  if (wname)
+	    qpw->qualities[count].name = stp_strdup(wname);
+	  if (wtext)
+	    qpw->qualities[count].text = stp_strdup(wtext);
+	  while (cchild)
+	    {
+	      if (cchild->type == STP_MXML_ELEMENT &&
+		  (!strcmp(cchild->value.element.name, "minimumResolution") ||
+		   !strcmp(cchild->value.element.name, "maximumResolution") ||
+		   !strcmp(cchild->value.element.name, "desiredResolution")))
+		{
+		  long data[2] = { 0, 0 };
+		  stp_mxml_node_t *ccchild = cchild->child;
+		  data[0] = stp_xmlstrtol(ccchild->value.text.string);
+		  ccchild = ccchild->next;
+		  data[1] = stp_xmlstrtol(ccchild->value.text.string);
+		  if (!strcmp(cchild->value.element.name, "minimumResolution"))
+		    {
+		      qpw->qualities[count].min_hres = data[0];
+		      qpw->qualities[count].min_vres = data[1];
+		    }			      
+		  else if (!strcmp(cchild->value.element.name, "maximumResolution"))
+		    {
+		      qpw->qualities[count].max_hres = data[0];
+		      qpw->qualities[count].max_vres = data[1];
+		    }			      
+		  else if (!strcmp(cchild->value.element.name, "desiredResolution"))
+		    {
+		      qpw->qualities[count].desired_hres = data[0];
+		      qpw->qualities[count].desired_vres = data[1];
+		    }			      
+		}
+	      cchild = cchild->next;
+	    }
+	  count++;
+	}
+      child = child->next;
+    }
+  return 1;
+}
 
-const quality_list_t *
-stpi_escp2_get_quality_list_named(const char *n)
+int
+stp_escp2_load_quality_presets(const stp_vars_t *v, const char *name)
 {
-  int i;
-  if (n)
-    for (i = 0; i < sizeof(the_qualities) / sizeof(qual_t); i++)
-      {
-	if (strcmp(n, the_qualities[i].name) == 0)
-	  return the_qualities[i].quality_list;
-      }
-  return NULL;
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  int found = 0;
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *ffn = stpi_path_merge(dn, name);
+      stp_mxml_node_t *qualities =
+	stp_mxmlLoadFromFile(NULL, ffn, STP_MXML_NO_CALLBACK);
+      stp_free(ffn);
+      if (qualities)
+	{
+	  stp_mxml_node_t *node = stp_mxmlFindElement(qualities, qualities,
+						      "escp2:QualityPresets", NULL,
+						      NULL, STP_MXML_DESCEND);
+	  if (node)
+	    stp_escp2_load_quality_presets_from_xml(v, node);
+	  stp_mxmlDelete(qualities);
+	  found = 1;
+	  break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to load quality presets from %s!\n", name);
+      stp_abort();
+    }
+  return found;
 }
diff --git a/src/main/generic-options.c b/src/main/generic-options.c
index fc9746c..d0e52da 100644
--- a/src/main/generic-options.c
+++ b/src/main/generic-options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: generic-options.c,v 1.10 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: generic-options.c,v 1.11 2008/07/04 14:29:29 rlk Exp $"
  *
  *   Copyright 2003 Robert Krawitz (rlk@alum.mit.edu)
  *
@@ -15,7 +15,7 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111STP_CHANNEL_NONE307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -62,25 +62,25 @@ static const stp_parameter_t the_parameters[] =
     "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
     N_("Print Quality"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "ImageType", N_("Image Type"), N_("Basic Image Adjustment"),
     N_("Type of image being printed"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "JobMode", N_("Job Mode"), N_("Job Mode"),
     N_("Job vs. page mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PageNumber", N_("Page Number"), N_("Job Mode"),
     N_("Page number"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 0, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 0, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
diff --git a/src/main/mxml-file.c b/src/main/mxml-file.c
index ef676e7..3209169 100644
--- a/src/main/mxml-file.c
+++ b/src/main/mxml-file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mxml-file.c,v 1.7 2004/09/17 18:38:21 rleigh Exp $"
+ * "$Id: mxml-file.c,v 1.10 2008/07/20 01:12:15 easysw Exp $"
  *
  * File loading code for mini-XML, a small XML-like file parsing library.
  *
@@ -18,6 +18,7 @@
  * Contents:
  *
  *   stp_mxmlLoadFile()        - Load a file into an XML node tree.
+ *   stp_mxmlLoadFromFile()    - Load a file into an XML node tree.
  *   stp_mxmlLoadString()      - Load a string into an XML node tree.
  *   stp_mxmlSaveAllocString() - Save an XML node tree to an allocated string.
  *   stp_mxmlSaveFile()        - Save an XML tree to a file.
@@ -86,6 +87,32 @@ stp_mxmlLoadFile(stp_mxml_node_t *top,		/* I - Top node */
   return (mxml_load_data(top, fp, cb, mxml_file_getc));
 }
 
+/*
+ * 'stp_mxmlLoadFromFile()' - Load a named file into an XML node tree.
+ *
+ * The nodes in the specified file are added to the specified top node.
+ * If no top node is provided, the XML file MUST be well-formed with a
+ * single parent node like <?xml> for the entire file. The callback
+ * function returns the value type that should be used for child nodes.
+ * If STP_MXML_NO_CALLBACK is specified then all child nodes will be either
+ * STP_MXML_ELEMENT or STP_MXML_TEXT nodes.
+ */
+
+stp_mxml_node_t *				/* O - First node or NULL if the file could not be read. */
+stp_mxmlLoadFromFile(stp_mxml_node_t *top,	/* I - Top node */
+		     const char *file,		/* I - File to read from */
+		     stp_mxml_type_t (*cb)(stp_mxml_node_t *))
+					/* I - Callback function or STP_MXML_NO_CALLBACK */
+{
+  FILE *fp = fopen(file, "r");
+  stp_mxml_node_t *doc;
+  if (! fp)
+    return NULL;
+  doc = stp_mxmlLoadFile(top, fp, cb);
+  fclose(fp);
+  return doc;
+}
+
 
 /*
  * 'stp_mxmlLoadString()' - Load a string into an XML node tree.
@@ -202,6 +229,24 @@ stp_mxmlSaveFile(stp_mxml_node_t *node,		/* I - Node to write */
   return (0);
 }
 
+int					/* O - 0 on success, -1 on error. */
+stp_mxmlSaveToFile(stp_mxml_node_t *node,	/* I - Node to write */
+		   const char      *file,	/* I - File to write to */
+		   int             (*cb)(stp_mxml_node_t *, int))
+					/* I - Whitespace callback or STP_MXML_NO_CALLBACK */
+{
+  FILE *fp = fopen(file, "w");
+  int answer;
+  int status;
+  if (!fp)
+    return -1;
+  answer = stp_mxmlSaveFile(node, fp, cb);
+  status = fclose(fp);
+  if (status != 0)
+    return -1;
+  else
+    return answer;
+}
 
 /*
  * 'stp_mxmlSaveString()' - Save an XML node tree to a string.
@@ -562,7 +607,7 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	  */
 
 	  fprintf(stderr, "Mismatched close tag <%s> under parent <%s>!\n",
-	          buffer, parent->value.element.name);
+	          buffer, parent ? parent->value.element.name : "(null)");
           break;
 	}
 
@@ -1432,5 +1477,5 @@ mxml_write_ws(stp_mxml_node_t *node,	/* I - Current node */
 
 
 /*
- * End of "$Id: mxml-file.c,v 1.7 2004/09/17 18:38:21 rleigh Exp $".
+ * End of "$Id: mxml-file.c,v 1.10 2008/07/20 01:12:15 easysw Exp $".
  */
diff --git a/src/main/path.c b/src/main/path.c
index 03ad06e..12a9ec8 100644
--- a/src/main/path.c
+++ b/src/main/path.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: path.c,v 1.19 2006/07/07 21:31:02 rleigh Exp $"
+ * "$Id: path.c,v 1.20 2008/06/01 14:41:18 rlk Exp $"
  *
  *   Gutenprint path functions - split and search paths.
  *
@@ -33,8 +33,6 @@
 #include <unistd.h>
 
 static int stpi_path_check(const struct dirent *module);
-static char *stpi_path_merge(const char *path,
-			     const char *file);
 static int stpi_scandir (const char *dir,
 			 struct dirent ***namelist,
 			 int (*sel) (const struct dirent *),
@@ -150,11 +148,33 @@ stpi_path_check(const struct dirent *module) /* File to check */
   return status;
 }
 
+stp_list_t *
+stpi_data_path(void)
+{
+  stp_list_t *dir_list;                  /* List of directories to scan */
+  if (!(dir_list = stp_list_create()))
+    return NULL;
+  stp_list_set_freefunc(dir_list, stp_list_node_free_data);
+  if (getenv("STP_DATA_PATH"))
+    stp_path_split(dir_list, getenv("STP_DATA_PATH"));
+  else
+    stp_path_split(dir_list, PKGXMLDATADIR);
+  return dir_list;
+}
+
+stp_list_t *
+stpi_list_files_on_data_path(const char *name)
+{
+  stp_list_t *dir_list = stpi_data_path(); /* List of directories to scan */
+  stp_list_t *file_list = stp_path_search(dir_list, name);
+  stp_list_destroy(dir_list);
+  return file_list;
+}
 
 /*
  * Join a path and filename together.
  */
-static char *
+char *
 stpi_path_merge(const char *path, /* Path */
 	       const char *file) /* Filename */
 {
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 9a2080d..6e085fb 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.226 2008/04/20 13:39:16 faust3 Exp $"
+ * "$Id: print-canon.c,v 1.229 2008/08/06 20:46:49 faust3 Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -200,79 +200,85 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerRadius", N_("CD Hub Size"), N_("Basic Printer Setup"),
     N_("Print only outside of the hub of the CD, or all the way to the hole"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDOuterDiameter", N_("CD Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment for the outer diameter of CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerDiameter", N_("CD Hub Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment to the inner hub of the CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDXAdjustment", N_("CD Horizontal Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDYAdjustment", N_("CD Vertical Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("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, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
     N_("Duplex/Tumble Setting"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
+    N_("Print Quality"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
 };
 
@@ -324,26 +330,26 @@ static const float_param_t float_parameters[] =
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
  {
     {
-      "LightYellowTransition", N_("Light Yellow Transition"), N_("Advanced Ink Adjustment"),
+      "LightYellowTrans", N_("Light Yellow Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Yellow Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
 };
@@ -454,9 +460,11 @@ canon_source_type(const char *name, const canon_cap_t * caps)
 static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
     const char* input_slot = stp_get_string_parameter(v, "InputSlot");
     const char *resolution = stp_get_string_parameter(v, "Resolution");
+    const char *quality = stp_get_string_parameter(v, "Quality");
     const canon_cap_t * caps = canon_get_model_capabilities(v);
     const canon_mode_t* mode = NULL;
     int i;
+
     if(resolution){
         for(i=0;i<caps->modelist->count;i++){
             if(!strcmp(resolution,caps->modelist->modes[i].name)){
@@ -465,10 +473,20 @@ static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
             }
         }
     }
+
     if(!mode)
         mode = &caps->modelist->modes[caps->modelist->default_mode];
 
 #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++){
@@ -806,6 +824,16 @@ canon_parameters(const stp_vars_t *v, const char *name,
     else
       description->is_active = 0;
   }
+  else if (strcmp(name, "Quality") == 0)
+  {
+    int has_standard_quality = 0;
+    description->bounds.str = stp_string_list_create();
+    stp_string_list_add_string(description->bounds.str, "None",
+			       _("Manual Control"));
+    stp_string_list_add_string(description->bounds.str, "Standard",
+			       _("Standard"));
+    description->deflt.str = "Standard";
+  }
 }
 
 
@@ -1587,7 +1615,7 @@ static void canon_setup_channels(stp_vars_t *v,canon_privdata_t* privdata){
     const char secondary[STP_NCOLORS] = {'k','c','m','y'};
     /* names of the density adjustment controls */
     const char *primary_density_control[STP_NCOLORS] = {"BlackDensity","CyanDensity","MagentaDensity","YellowDensity"};
-    const char *secondary_density_control[STP_NCOLORS] = {NULL,"LightCyanTransition","LightMagentaTransition","LightYellowTransition"};
+    const char *secondary_density_control[STP_NCOLORS] = {NULL,"LightCyanTrans","LightMagentaTrans","LightYellowTrans"};
     /* ink darkness for every channel */
     const double ink_darkness[] = {1.0, 0.31 / .5, 0.61 / .97, 0.08};
     const char* channel_order = default_channel_order;
diff --git a/src/main/print-color.c b/src/main/print-color.c
index 0c7e592..9b0ec54 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.139 2008/01/25 00:38:32 rlk Exp $"
+ * "$Id: print-color.c,v 1.140 2008/07/09 00:26:52 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -176,7 +176,7 @@ static const float_param_t float_parameters[] =
       "ColorCorrection", N_("Color Correction"), N_("Basic Image Adjustment"),
       N_("Color correction to be applied"),
       STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
     }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 9a7ff60..5a51947 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2-data.c,v 1.246 2008/02/27 00:43:37 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.270 2008/07/16 02:00:17 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -30,2019 +30,472 @@
 #include "print-escp2.h"
 #include <limits.h>
 
-/*
- * Dot sizes are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*   0     1     2     3     4     5     6     7     8 */
-
-static const escp2_dot_size_t g1_dotsizes =
-{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t g2_dotsizes =
-{   -2,   -2,   -2,   -2,   -1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t g3_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t c6pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c4pl_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c4pl_pigment_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c3pl_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c3pl_pigment_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
-
-static const escp2_dot_size_t c3pl_pigment_c120_dotsizes =
-{ 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13 };
-
-static const escp2_dot_size_t p3pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12 };
-
-static const escp2_dot_size_t p1_5pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x13, 0x13 };
-
-static const escp2_dot_size_t claria_dotsizes =
-{ 0x33, 0x33, 0x24, 0x24, 0x24, 0x24, 0x25, 0x25, 0x25 };
-
-static const escp2_dot_size_t claria_1400_dotsizes =
-{ 0x33, 0x33, 0x21, 0x21, 0x33, 0x33, 0x25, 0x25, 0x25 };
-
-static const escp2_dot_size_t c2pl_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x13,   -1, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t c1_8pl_dotsizes =
-{ 0x10, 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x13, 0x13 };
-
-static const escp2_dot_size_t p3_5pl_dotsizes =
-{ 0x10, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12 };
-
-static const escp2_dot_size_t sc440_dotsizes =
-{    3,    3,    2,    1,   -1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc480_dotsizes =
-{ 0x13, 0x13, 0x13, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 };
-
-static const escp2_dot_size_t sc600_dotsizes =
-{    4,    4,    3,    2,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc640_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc660_dotsizes =
-{    3,    3,    0,    0,    0,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sc670_dotsizes =
-{ 0x12, 0x12, 0x12, 0x11, 0x11,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sp700_dotsizes =
-{    3,    3,    2,    1,    4,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sp720_dotsizes =
-{ 0x12, 0x12, 0x11, 0x11, 0x11,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t sp2000_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro_dye_dotsizes =
-{    3,    3,    3,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro_pigment_dotsizes =
-{    3,    3,    2,    1,    1,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro10000_dotsizes =
-{    4, 0x11, 0x11, 0x10, 0x10,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro5000_dotsizes =
-{    3,    3,    2,    1,    4,   -1,   -1,   -1,   -1 };
-
-static const escp2_dot_size_t spro_c4pl_pigment_dotsizes =
-{ 0x11, 0x11, 0x11, 0x10, 0x10,   -1,    5,    5,    5 };
-
-static const escp2_dot_size_t picturemate_dotsizes =
-{   -1,   -1,   -1,   -1, 0x12, 0x12, 0x12, 0x12,   -1 };
-
-/*
- * Bits are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*   0     1     2     3     4     5     6     7     8 */
-
-static const escp2_bits_t variable_bits =
-{    2,    2,    2,    2,    2,    2,    2,    2,    2 };
-
-static const escp2_bits_t stp950_bits =
-{    2,    2,    2,    2,    2,    2,    1,    1,    1 };
-
-static const escp2_bits_t ultrachrome_bits =
-{    2,    2,    2,    2,    2,    1,    1,    1,    1 };
-
-static const escp2_bits_t standard_bits =
-{    1,    1,    1,    1,    1,    1,    1,    1,    1 };
-
-static const escp2_bits_t c1_8_bits =
-{    2,    2,    2,    2,    2,    1,    1,    1,    1 };
-
-/*
- * Base resolutions are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*   0     1     2     3     4     5     6     7     8 */
-
-static const escp2_base_resolutions_t standard_base_res =
-{  720,  720,  720,  720,  720,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t g3_base_res =
-{  720,  720,  720,  720,  360,  360,  360,  360,  360 };
-
-static const escp2_base_resolutions_t variable_base_res =
-{  360,  360,  360,  360,  360,  360,  360,  360,  360 };
-
-static const escp2_base_resolutions_t stp950_base_res =
-{  360,  360,  360,  360,  360,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t ultrachrome_base_res =
-{  360,  360,  360,  360,  360,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t c1_8_base_res =
-{  360,  360,  720,  720,  720, 1440, 1440, 1440, 1440 };
-
-static const escp2_base_resolutions_t c1_5_base_res =
-{  360,  360,  720,  720,  720,  720,  720,  720,  720 };
-
-static const escp2_base_resolutions_t claria_1400_base_res =
-{  360,  360,  720,  720,  360,  360,  720,  720,  720 };
-
-static const escp2_base_resolutions_t stc900_base_res =
-{  360,  360,  360,  360,  180,  180,  360,  360,  360 };
-
-static const escp2_base_resolutions_t pro_base_res =
-{ 2880, 2880, 2880, 2880, 2880, 2880, 2880, 2880, 5760 };
-
-/*
- * Densities are for:
- *
- *  0: 120/180
- *  1: 360
- *  2: 720x360
- *  3: 720
- *  4: 1440x720
- *  5: 2880x720 or 1440x1440
- *  6: 2880x1440
- *  7: 2880x2880
- *  8: 5760x2880
- */
-
-/*  0    1     2       3    4      5      6      7      8 */
-
-static const escp2_densities_t g1_densities =
-{ 2.6, 1.3,  1.3,  0.568, 0.0,   0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t g3_densities =
-{ 2.6, 1.3,  0.65, 0.775, 0.388, 0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t c6pl_densities =
-{ 4.0, 2.0,  1.0,  0.568, 0.568, 0.568, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t c4pl_2880_densities =
-{ 2.6, 1.3,  0.65, 0.650, 0.650, 0.650, 0.32,  0.0,   0.0   };
-
-static const escp2_densities_t c4pl_densities =
-{ 2.6, 1.3,  0.65, 0.568, 0.523, 0.792, 0.396, 0.0,   0.0   };
-
-static const escp2_densities_t c4pl_pigment_densities =
-{ 2.3, 1.15, 0.58, 0.766, 0.388, 0.958, 0.479, 0.0,   0.0   };
-
-static const escp2_densities_t c3pl_pigment_densities =
-{ 2.4, 1.2,  0.60, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
-
-static const escp2_densities_t c3pl_pigment_c66_densities =
-{ 2.8, 1.4,  0.70, 0.600, 0.512, 0.512, 0.512, 0.0,   0.0   };
-
-static const escp2_densities_t c3pl_pigment_c120_densities =
-{ 4.0, 2.0,  1.56, 0.780, 0.512, 0.512, 0.512, 0.256, 0.128 };
-
-static const escp2_densities_t c3pl_densities =
-{ 2.6, 1.3,  0.65, 0.730, 0.7,   0.91,  0.455, 0.0,   0.0   };
-
-static const escp2_densities_t p3pl_densities =
-{ 4.0, 2.0,  1.00, 0.679, 0.657, 0.684, 0.566, 0.283, 0.0   };
-
-static const escp2_densities_t p1_5pl_densities =
-{ 2.8, 1.4,  1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
-
-static const escp2_densities_t claria_densities =
-{ 4.0, 4.0,  3.52, 1.760, 0.880, 0.440, 0.586, 0.733, 0.440 };
-
-static const escp2_densities_t claria_1400_densities =
-{ 4.0, 4.0,  3.52, 1.760, 0.880, 0.440, 0.586, 0.733, 0.440 };
-
-static const escp2_densities_t p3_5pl_densities =
-{ 2.8, 1.4,  1.77, 0.886, 0.443, 0.221, 0.240, 0.293, 0.146 };
-
-static const escp2_densities_t c2pl_densities =
-{ 2.0, 1.0,  0.5,  0.650, 0.650, 0.0,   0.650, 0.325, 0.0   };
-
-static const escp2_densities_t c1_8pl_densities =
-{ 2.3, 1.15, 0.57, 0.650, 0.650, 0.0,   0.650, 0.360, 0.0   };
-
-static const escp2_densities_t sc1500_densities =
-{ 2.6, 1.3,  1.3,  0.631, 0.0,   0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc440_densities =
-{ 4.0, 2.0,  1.0,  0.900, 0.45,  0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc480_densities =
-{ 2.8, 1.4,  0.7,  0.710, 0.710, 0.546, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc660_densities =
-{ 4.0, 2.0,  1.0,  0.646, 0.323, 0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sc980_densities =
-{ 2.6, 1.3,  0.65, 0.511, 0.49,  0.637, 0.455, 0.0,   0.0   };
-
-static const escp2_densities_t sp700_densities =
-{ 2.6, 1.3,  1.3,  0.775, 0.55,  0.0,   0.0,   0.0,   0.0   };
-
-static const escp2_densities_t sp2000_densities =
-{ 2.6, 1.3,  0.65, 0.852, 0.438, 0.219, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t spro_dye_densities =
-{ 2.6, 1.3,  1.3,  0.775, 0.388, 0.275, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t spro_pigment_densities =
-{ 3.0, 1.5,  0.78, 0.775, 0.388, 0.194, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t spro10000_densities =
-{ 2.6, 1.3,  0.65, 0.431, 0.216, 0.392, 0.0,   0.0,   0.0   };
-
-static const escp2_densities_t picturemate_densities =
-{   0,   0,     0,     0, 1.596, 0.798, 0.650, 0.530, 0.0   };
-
-
-static const stp_raw_t new_init_sequence = STP_RAW_STRING("\0\0\0\033\001@EJL 1284.4\n@EJL     \n\033@");
-
-static const stp_raw_t je_deinit_sequence = STP_RAW_STRING("JE\001\000\000");
-
-/* These sequences provided by Epson.  No, I don't know what
-   most of them mean. */
-
-static const stp_raw_t bsc64_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
-
-static const stp_raw_t bsc66_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
-
-static const stp_raw_t bsc68_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
-
-static const stp_raw_t bsc82_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\013\000\000\000\000\000\000\000\001\002\026\003\276\000\064\007\000\000\154\007\352\011\352\011\226\000\000\000\226\000\064\007\023\020\025\031\001\021\004\021\021\021\001\001\000\000\174\005");
-
-static const stp_raw_t bsc84_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
-
-static const stp_raw_t bsc86_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
-
-static const stp_raw_t bsc88_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
-
-static const stp_raw_t cx6400_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000\077\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000\077\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000\135\006");
-
-static const stp_raw_t cx6600_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000\077\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000\077\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000\135\006");
-
-static const stp_raw_t pm830c_borderless_sequence = STP_RAW_STRING("SN\054\000\000\001\027\000\000\000\000\000\000\001\003\000\243\156\000\223\170\220\065\002\000\000\005\277\001\270\006\144\000\164\016\032\004\042\005\310\031\000\100\000\022\143\102\007");
-
-static const stp_raw_t pm930c_borderless_sequence = STP_RAW_STRING("SN\070\000\000\007\027\000\000\000\000\000\000\001\003\000\330\006\124\001\264\015\042\013\110\007\060\011\316\022\054\001\251\013\054\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004\103\000\000\001\001\001\360\006");
-
-static const stp_raw_t pm970c_borderless_sequence = STP_RAW_STRING("SN\070\000\000\007\033\000\000\000\000\000\000\001\003\000\330\006\124\001\264\015\054\013\110\007\060\011\316\022\054\001\251\013\054\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004\103\000\000\001\001\001\364\006");
-
-static const stp_raw_t sp1280_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp780_borderless_sequence = STP_RAW_STRING("SN\003\000\000\000\002SN\003\000\000\001\001SN\003\000\000\011\001");
-
-static const stp_raw_t sp820_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp820u_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp825_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
-
-static const stp_raw_t sp890_borderless_sequence = STP_RAW_STRING("SN\003\000\000\000\010SN\003\000\000\001\001SN\003\000\000\002\000SN\003\000\000\007\000SN\003\000\000\011\001");
-
-static const stp_raw_t sp900_borderless_sequence = STP_RAW_STRING("SN\064\000\000\003\026\000\000\000\000\000\000\001\003\000\007\144\050\002\152\215\000\063\344\000\040\120\000\207\150\020\212\003\070\002\360\001\324\100\000\001\010\001\142\141\141\140\141\024\002\025\027\061\132\011");
-
-static const stp_raw_t sp925_borderless_sequence = STP_RAW_STRING("SN\054\000\000\001\027\000\000\000\000\000\000\001\003\000\243\156\000\223\170\220\065\002\000\000\005\277\001\270\006\144\000\024\036\032\004\042\005\310\031\000\100\000\022\143\362\006");
-
-static const stp_raw_t sp960_borderless_sequence = STP_RAW_STRING("SN\064\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006\166\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004\064\064\064\004\001\000\000\040\011");
-
-static const stp_raw_t spr300_borderless_sequence = STP_RAW_STRING("SN\120\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001\130\002\320\004\107\001\107\002\000\000\000\000\120\010\204\020\030\025\310\031\340\075\240\017\214\012\060\005\214\000\012\001\054\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\001\060\010");
-
-static const stp_raw_t spr320_borderless_sequence = STP_RAW_STRING("SN\120\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001\130\002\320\004\107\001\107\002\000\000\000\000\120\010\204\020\030\025\310\031\340\075\240\017\214\012\060\005\214\000\012\001\054\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\001\060\010");
-
-static const stp_raw_t spr800_borderless_sequence = STP_RAW_STRING("SN\124\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007\124\001\120\012\252\000\363\006\077\002\120\012\277\007\050\002\045\013\054\001\253\000\037\001\041\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033\143\143\143\143\143\143\143\143\143\143\143\002\000\001\000\001\001\362\014");
-
-static const stp_raw_t sprx500_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
-
-static const stp_raw_t sprx600_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
+typedef struct
+{
+  const char *attr_name;
+  short bit_shift;
+  short bit_width;
+} escp2_printer_attr_t;
 
-static const stp_raw_t sprx620_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
+static const escp2_printer_attr_t escp2_printer_attrs[] =
+{
+  { "command_mode",		0, 4 },
+  { "zero_margin",		4, 2 },
+  { "variable_mode",		6, 1 },
+  { "graymode",		 	7, 1 },
+  { "fast_360",			8, 1 },
+  { "send_zero_advance",        9, 1 },
+  { "supports_ink_change",     10, 1 },
+  { "packet_mode",             11, 1 },
+  { "interchangeable_ink",     12, 1 },
+  { "envelope_landscape",      13, 1 },
+};
 
-static const stp_raw_t generic_borderless_sequence = STP_RAW_STRING("SN\001\000\000US\003\000\000\000\002");
+static stpi_escp2_printer_t *escp2_model_capabilities;
 
-#define INCH(x)		(72 * x)
+static int escp2_model_count = 0;
 
-const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
+static void
+load_model_from_file(const stp_vars_t *v, stp_mxml_node_t *xmod, int model)
 {
-  /* FIRST GENERATION PRINTERS */
-  /* 0: Stylus Color */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 1, 4, 15, 1, 4, 15, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, g1_densities, "simple",
-    "720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 1: Stylus Color 400/500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g2_dotsizes, g1_densities, "simple",
-    "sc500", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 2: Stylus Color 1500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17), INCH(44), INCH(2), INCH(2), INCH(17), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, sc1500_densities, "simple",
-    "sc500", "cmy",
-    standard_bits, standard_base_res, "standard_roll_feed",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 3: Stylus Color 600 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    sc600_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 4: Stylus Color 800 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 5: Stylus Color 850 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 6: Stylus Color 1520 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17), INCH(44), INCH(2), INCH(2), INCH(136 / 10), INCH(44),
-    8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "standard_roll_feed",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-
-  /* SECOND GENERATION PRINTERS */
-  /* 7: Stylus Photo 700 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,		/* Is it really 15 pairs??? */
-    sp700_dotsizes, sp700_densities, "simple",
-    "g3", "photo_gen1",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-  /* 8: Stylus Photo EX */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_NO | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(118 / 10), INCH(44), INCH(2), INCH(2), INCH(118 / 10), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    sp700_dotsizes, sp700_densities, "simple",
-    "g3", "photo_gen1",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-  /* 9: Stylus Photo */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    sp700_dotsizes, sp700_densities, "simple",
-    "g3_720dpi", "photo_gen1",
-    standard_bits, g3_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-
-  /* THIRD GENERATION PRINTERS */
-  /* 10: Stylus Color 440/460 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    21, 1, 4, 21, 1, 4, 21, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,
-    sc440_dotsizes, sc440_densities, "simple",
-    "g3_720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 11: Stylus Color 640 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,
-    sc640_dotsizes, sc440_densities, "simple",
-    "sc640", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 12: Stylus Color 740/Stylus Scan 2000/Stylus Scan 2500 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 13: Stylus Color 900 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c3pl_dotsizes, c3pl_densities, "variable_3pl",
-    "1440dpi", "standard",
-    variable_bits, stc900_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 14: Stylus Photo 750 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 15: Stylus Photo 1200 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 16: Stylus Color 860 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 17: Stylus Color 1160 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 18: Stylus Color 660 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0, 0,
-    1, 15, 0, 0,
-    sc660_dotsizes, sc660_densities, "simple",
-    "sc640", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 19: Stylus Color 760 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 20: Stylus Photo 720 (Australia) */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sp720_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 21: Stylus Color 480 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "720dpi_soft", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 22: Stylus Photo 870/875 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 23: Stylus Photo 1270 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
-    "1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 24: Stylus Color 3000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17), INCH(44), INCH(2), INCH(2), INCH(17), INCH(44),
-    8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g3_dotsizes, g3_densities, "simple",
-    "g3", "standard",
-    standard_bits, g3_base_res, "standard_roll_feed",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 25: Stylus Color 670 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc670_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 26: Stylus Photo 2000P */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    2, 15, 0, 0,
-    sp2000_dotsizes, sp2000_densities, "variable_2000p",
-    "1440dpi", "photo_pigment",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 27: Stylus Pro 5000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
-    360, 14400, -1, 1440, 720, 180, 180,
-    0, 1, 0, 0, 0, 0, 0, 4, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro5000_dotsizes, sp700_densities, "simple",
-    "1440dpi", "photo_gen1",
-    standard_bits, g3_base_res, "spro5000",
-    "standard", NULL, NULL,
-    NULL, NULL, "photo"
-  },
-  /* 28: Stylus Pro 7000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(24), INCH(1200), INCH(7), INCH(7), INCH(24), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_dye_dotsizes, spro_dye_densities, "simple",
-    "pro", "photo_gen1",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7000", "photo"
-  },
-  /* 29: Stylus Pro 7500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(24), INCH(1200), INCH(7), INCH(7), INCH(24), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, "simple",
-    "pro", "photo_pigment",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7500", "photo"
-  },
-  /* 30: Stylus Pro 9000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_dye_dotsizes, spro_dye_densities, "simple",
-    "pro", "photo_gen1",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7000", "photo"
-  },
-  /* 31: Stylus Pro 9500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, "simple",
-    "pro", "photo_pigment",
-    standard_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7500", "photo"
-  },
-  /* 32: Stylus Color 777/680 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 33: Stylus Color 880/83/C60 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 34: Stylus Color 980 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 180, 180,
-    38, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c3pl_dotsizes, sc980_densities, "variable_3pl",
-    "2880dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 35: Stylus Photo 780/790 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp780_borderless_sequence, NULL, "photo"
-  },
-  /* 36: Stylus Photo 785/890/895/915/935 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp890_borderless_sequence, NULL, "photo"
-  },
-  /* 37: Stylus Photo 1280/1290 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "standard_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp1280_borderless_sequence, NULL, "photo"
-  },
-  /* 38: Stylus Color 580 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 39: Stylus Color Pro XL */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, g1_densities, "simple",
-    "720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 40: Stylus Pro 5500 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, "simple",
-    "pro", "photo_pigment",
-    standard_bits, pro_base_res, "spro5000",
-    "standard", NULL, NULL,
-    NULL, "pro7500", "photo"
-  },
-  /* 41: Stylus Pro 10000 */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    spro10000_dotsizes, spro10000_densities, "spro10000",
-    "pro", "photo_gen2",
-    variable_bits, pro_base_res, "pro_roll_feed",
-    "standard", NULL, NULL,
-    NULL, "pro7000", "photo"
-  },
-  /* 42: Stylus C20SX/C20UX */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "720dpi_soft", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 43: Stylus C40SX/C40UX/C41SX/C41UX/C42SX/C42UX */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 44: Stylus C70/C80 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    60, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 45: Stylus Color Pro */
-  {
-    (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_NO| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(44), INCH(2), INCH(2), INCH(17 / 2), INCH(44),
-    9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    1, 7, 0, 0,
-    g1_dotsizes, g1_densities, "simple",
-    "720dpi", "standard",
-    standard_bits, standard_base_res, "default",
-    "standard", NULL, NULL,
-    NULL, NULL, "standard"
-  },
-  /* 46: Stylus Photo 950/960 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 24,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "f360_photo",
-    stp950_bits, stp950_base_res, "cd_cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp960_borderless_sequence, NULL, "sp960"
-  },
-  /* 47: Stylus Photo 2100/2200 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_H_ONLY | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_YES |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 96, 2, 96, 96, 2, 192, 192, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
-    4, 15, 0, 0,
-    c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
-    "superfine", "f360_ultrachrome",
-    ultrachrome_bits, ultrachrome_base_res, "cd_cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "sp2200"
-  },
-  /* 48: Stylus Pro 7600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(24), INCH(1200), INCH(7), INCH(7), INCH(24), INCH(1200),
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
-    "pro", "ultrachrome",
-    ultrachrome_bits, pro_base_res, "pro_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, "pro7600", "photo"
-  },
-  /* 49: Stylus Pro 9600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(44), INCH(1200), INCH(7), INCH(7), INCH(44), INCH(1200),
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
-    "pro", "ultrachrome",
-    ultrachrome_bits, pro_base_res, "pro_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, "pro7600", "photo"
-  },
-  /* 50: Stylus Photo 825/830 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880_1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp1280_borderless_sequence, NULL, "photo"
-  },
-  /* 51: Stylus Photo 925 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880_1440dpi", "photo_gen2",
-    variable_bits, variable_base_res, "cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp925_borderless_sequence, NULL, "photo"
-  },
-  /* 52: Stylus Color C62 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 1440, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880_1440dpi", "standard",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 53: Japanese PM-950C */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 24,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "f360_photo7_japan",
-    stp950_bits, stp950_base_res, "cd_cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp960_borderless_sequence, NULL, "pm_950c"
-  },
-  /* 54: Stylus Photo EX3 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(13), INCH(44), INCH(2), INCH(2), INCH(13), INCH(44),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    sp720_dotsizes, c6pl_densities, "variable_6pl",
-    "1440dpi", "photo_gen1",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "photo"
-  },
-  /* 55: Stylus C82/CX-5200 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 56: Stylus C50 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 57: Japanese PM-970C */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 180, 2, 360, 360, 1, 360, 360, 1, 7,
-    360, 14400, -1, 2880, 2880, 720, 360,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c1_8pl_dotsizes, c1_8pl_densities, "variable_2pl",
-    "superfine", "f360_photo7_japan",
-    c1_8_bits, c1_8_base_res, "cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &pm970c_borderless_sequence, NULL, "pm_950c"
-  },
-  /* 58: Japanese PM-930C */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 2, 90, 90, 2, 90, 90, 2, 6,
-    360, 14400, -1, 2880, 2880, 720, 360,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c1_8pl_dotsizes, c1_8pl_densities, "variable_2pl",
-    "superfine", "photo_gen2",
-    c1_8_bits, c1_8_base_res, "cutter_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &pm930c_borderless_sequence, NULL, "photo"
-  },
-  /* 59: Stylus C43SX/C43UX/C44SX/C44UX (WRONG -- see 43!) */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, "variable_x80_6pl",
-    "1440dpi", "x80",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 60: Stylus C84 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc84_borderless_sequence, NULL, "standard"
-  },
-  /* 61: Stylus Color C63/C64 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c64",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc64_borderless_sequence, NULL, "standard"
-  },
-  /* 62: Stylus Photo 900 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp900_borderless_sequence, NULL, "photo"
-  },
-  /* 63: Stylus Photo R300 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "photo_gen3",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &spr300_borderless_sequence, NULL, "photo"
-  },
-  /* 64: PM-G800/Stylus Photo R800 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 5760, 2880, 360, 180,
-    180 * 2, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "cmykrb",
-    variable_bits, c1_5_base_res, "r1800",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &spr800_borderless_sequence, NULL, "r800"
-  },
-  /* 65: Stylus Photo CX4600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "cx3650",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "mfp2005"
-  },
-  /* 66: Stylus Color C65/C66 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
-    "2880_1440dpi", "c64",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc66_borderless_sequence, NULL, "standard"
-  },
-  /* 67: Stylus Photo R1800 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 5760, 2880, 360, 180,
-    180 * 2, 1, 0, 96, 42, 0, 0, 0, 1, 180, 5760 * 2880,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "cmykrb",
-    variable_bits, c1_5_base_res, "r1800",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &spr800_borderless_sequence, NULL, "r800"
-  },
-  /* 68: PM-G820 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 5760, 2880, 360, 180,
-    180 * 2, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "cmykrb",
-    variable_bits, c1_5_base_res, "cd_roll_feed",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &spr800_borderless_sequence, NULL, "r800"
-  },
-  /* 69: Stylus C86 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 2880, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &bsc86_borderless_sequence, NULL, "standard"
-  },
-  /* 70: Stylus Photo RX700 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
-    360, 28800, -1, 5760, 2880, 360, 180,
-    10, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 0,
-    4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
-    "superfine", "photo_gen3",
-    variable_bits, c1_5_base_res, "rx700",
-    "p1_5", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "rx700"
-  },
-  /* 71: Stylus Photo R2400 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_YES |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 5760, 2880, 360, 180,
-    10, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    p3_5pl_dotsizes, p3_5pl_densities, "variable_r2400",
-    "superfine", "f360_ultrachrome_k3",
-    variable_bits, c1_5_base_res, "r2400",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "r2400"
-  },
-  /* 72: Stylus CX3700/3800/3810 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
-    "2880_1440dpi", "c64",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "cx3800"
-  },
-  /* 73: E-100/PictureMate */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 28800, -1, 5760, 1440, 1440, 720,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(4), INCH(1200), INCH(2), INCH(2), INCH(4), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    picturemate_dotsizes, picturemate_densities, "variable_picturemate",
-    "picturemate", "picturemate_6",
-    variable_bits, c1_5_base_res, "default",
-    "picturemate", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "picturemate_6"
-  },
-  /* 74: PM-A650 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
-    "superfine", "c64",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "standard"
-  },
-  /* 75: Japanese PM-A750 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "c64",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "standard"
-  },
-  /* 76: Japanese PM-A890 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 90, 3, 90, 90, 3, 90, 90, 3, 6,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
-    4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, "variable_2pl",
-    "superfine", "photo_gen3",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "standard"
-  },
-  /* 77: Japanese PM-D600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "c64",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "photo"
-  },
-  /* 78: Stylus Photo 810/820 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_YES),
-    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
-    INCH(19 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
-    "2880dpi", "photo_gen2",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sp1280_borderless_sequence, NULL, "photo"
-  },
-  /* 79: Stylus CX6400 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 720 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &cx6400_borderless_sequence, NULL, "standard"
-  },
-  /* 80: Stylus CX6600 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 2880, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 1440 * 720,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
-    "2880_1440dpi", "c82",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &cx6600_borderless_sequence, NULL, "standard"
-  },
-  /* 81: Stylus Photo R260 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 4, 90, 1, 4, 90, 1, 4, 6,
-    360, 14400, -1, 5760, 2880, 360, 90,
-    90 * 4, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 189, 595, 842, 24,
-    4, 15, 0, 0,
-    claria_dotsizes, claria_densities, "variable_claria",
-    "superfine", "claria",
-    variable_bits, c1_5_base_res, "cd_roll_feed",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "sp1400"
-  },
-  /* 82: Stylus Photo 1400 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 4, 90, 1, 4, 90, 1, 4, 6,
-    360, 14400, -1, 5760, 2880, 360, 90,
-    90 * 4, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 5760 * 2880,
-    INCH(13), INCH(1200), INCH(2), INCH(2), INCH(13), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 24,
-    4, 15, 0, 0,
-    claria_1400_dotsizes, claria_1400_densities, "variable_claria_1400",
-    "claria_1400", "claria",
-    variable_bits, claria_1400_base_res, "cd_roll_feed",
-    "v2880", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "sp1400"
-  },
-  /* 83: Stylus Photo R240 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "photo_gen3_4",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &spr300_borderless_sequence, NULL, "standard"
-  },
-  /* 84: Stylus Photo RX500 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
-    4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
-    "superfine", "photo_gen3",
-    variable_bits, variable_base_res, "cd_roll_feed",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &sprx500_borderless_sequence, NULL, "photo"
-  },
-  /* 85: Stylus C120 */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    59, 60, 2, 360, 1, 1, 360, 1, 1, 4,
-    360, 14400, -1, 5760, 2880, 360, 180,
-    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 5760 * 2880,
-    INCH(17 / 2), INCH(1200), INCH(2), INCH(2), INCH(17 / 2), INCH(1200),
-    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
-    4, 15, 0, 0,
-    c3pl_pigment_c120_dotsizes, c3pl_pigment_c120_densities, "variable_3pl_pigment_c120",
-    "superfine", "c120",
-    variable_bits, variable_base_res, "default",
-    "standard", &new_init_sequence, &je_deinit_sequence,
-    &generic_borderless_sequence, NULL, "c120"
-  },
-  /* 86: PictureMate 4-color */
-  {
-    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
-     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
-     MODEL_PACKET_MODE_YES| MODEL_INTERCHANGEABLE_INK_NO |
-     MODEL_ENVELOPE_LANDSCAPE_NO),
-    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 28800, -1, 5760, 1440, 1440, 720,
-    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
-    INCH(4), INCH(1200), INCH(2), INCH(2), INCH(4), INCH(1200),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
-    4, 15, 0, 0,
-    picturemate_dotsizes, picturemate_densities, "variable_picturemate",
-    "picturemate", "picturemate_4",
-    variable_bits, c1_5_base_res, "default",
-    "picturemate", &new_init_sequence, &je_deinit_sequence,
-    NULL, NULL, "picturemate_4"
-  },
-};
+  stp_mxml_node_t *tmp = xmod->child;
+  stpi_escp2_printer_t *p = stp_escp2_get_printer(v);
+  int found_black_head_config = 0;
+  int found_fast_head_config = 0;
+  p->max_black_resolution = -1;
+  p->cd_x_offset = -1;
+  p->cd_y_offset = -1;
+  while (tmp)
+    {
+      if (tmp->type == STP_MXML_ELEMENT)
+	{
+	  const char *name = tmp->value.element.name;
+	  const char *target = stp_mxmlElementGetAttr(tmp, "src");
+	  if (target)
+	    {
+	      if (!strcmp(name, "media"))
+		stp_escp2_load_media(v, target);
+	      else if (!strcmp(name, "inputSlots"))
+		stp_escp2_load_input_slots(v, target);
+	      else if (!strcmp(name, "mediaSizes"))
+		stp_escp2_load_media_sizes(v, target);
+	      else if (!strcmp(name, "printerWeaves"))
+		stp_escp2_load_printer_weaves(v, target);
+	      else if (!strcmp(name, "qualityPresets"))
+		stp_escp2_load_quality_presets(v, target);
+	      else if (!strcmp(name, "resolutions"))
+		stp_escp2_load_resolutions(v, target);
+	      else if (!strcmp(name, "inkGroup"))
+		stp_escp2_load_inkgroup(v, target);
+	    }
+	  else if (tmp->child && tmp->child->type == STP_MXML_TEXT)
+	    {
+	      stp_mxml_node_t *child = tmp->child;
+	      const char *val = child->value.text.string;
+	      if (!strcmp(name, "verticalBorderlessSequence"))
+		{
+		  if (p->vertical_borderless_sequence)
+		    {
+		      stp_erprintf("Reassigning vertical borderless sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->vertical_borderless_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "preinitSequence"))
+		{
+		  if (p->preinit_sequence)
+		    {
+		      stp_erprintf("Reassigning pre-init sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->preinit_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "preinitRemoteSequence"))
+		{
+		  if (p->preinit_remote_sequence)
+		    {
+		      stp_erprintf("Reassigning pre-init remote sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->preinit_remote_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "postinitRemoteSequence"))
+		{
+		  if (p->postinit_remote_sequence)
+		    {
+		      stp_erprintf("Reassigning post-init remote sequence for model %d\n", model);
+		      stp_abort();
+		    }
+		  p->postinit_remote_sequence = stp_xmlstrtoraw(val);
+		}
+	      else if (!strcmp(name, "commandSet"))
+		{
+		  if (!strcmp(val, "1998"))
+		    p->flags |= MODEL_COMMAND_1998;
+		  else if (!strcmp(val, "1999"))
+		    p->flags |= MODEL_COMMAND_1999;
+		  else if (!strcmp(val, "2000"))
+		    p->flags |= MODEL_COMMAND_2000;
+		  else if (!strcmp(val, "Pro"))
+		    p->flags |= MODEL_COMMAND_PRO;
+		}
+	      else if (!strcmp(name, "borderless"))
+		{
+		  if (!strcmp(val, "No"))
+		    p->flags |= MODEL_ZEROMARGIN_NO;
+		  else if (!strcmp(val, "Yes"))
+		    p->flags |= MODEL_ZEROMARGIN_YES;
+		  else if (!strcmp(val, "Full"))
+		    p->flags |= MODEL_ZEROMARGIN_FULL;
+		  else if (!strcmp(val, "HorizontalOnly"))
+		    p->flags |= MODEL_ZEROMARGIN_H_ONLY;
+		}
+	      else if (!strcmp(name, "preferredEnvelopeOrientation") &&
+		       !strcmp(val, "Landscape"))
+		p->flags |= MODEL_ENVELOPE_LANDSCAPE_YES;
+	      else if (!strcmp(name, "headConfiguration"))
+		{
+		  const char *htype = stp_mxmlElementGetAttr(tmp, "type");
+		  unsigned long data[4] = { 0, 0, 0, 0 };
+		  while (child)
+		    {
+		      if (child->type == STP_MXML_ELEMENT && child->child &&
+			  child->child->type == STP_MXML_TEXT)
+			{
+			  const char *cname = child->value.element.name;
+			  const char *cval = child->child->value.text.string;
+			  if (!strcmp(cname, "Nozzles"))
+			    data[0] = stp_xmlstrtoul(cval);
+			  else if (!strcmp(cname, "MinNozzles"))
+			    data[1] = stp_xmlstrtoul(cval);
+			  else if (!strcmp(cname, "FirstNozzle"))
+			    data[2] = stp_xmlstrtoul(cval);
+			  else if (!strcmp(cname, "NozzleSeparation"))
+			    data[3] = stp_xmlstrtoul(cval);
+			}
+		      child = child->next;
+		    }		      
+		  if (!strcmp(htype, "default"))
+		    {
+		      p->nozzles = data[0];
+		      p->min_nozzles = data[1];
+		      p->nozzle_start = data[2];
+		      p->nozzle_separation = data[3];
+		      if (!found_black_head_config)
+			{
+			  p->black_nozzles = data[0];
+			  p->min_black_nozzles = data[1];
+			  p->black_nozzle_start = data[2];
+			  p->black_nozzle_separation = data[3];
+			}
+		      if (!found_fast_head_config)
+			{
+			  p->fast_nozzles = data[0];
+			  p->min_fast_nozzles = data[1];
+			  p->fast_nozzle_start = data[2];
+			  p->fast_nozzle_separation = data[3];
+			}
+		    }
+		  else if (!strcmp(htype, "black"))
+		    {
+		      p->black_nozzles = data[0];
+		      p->min_black_nozzles = data[1];
+		      p->black_nozzle_start = data[2];
+		      p->black_nozzle_separation = data[3];
+		      found_black_head_config = 1;
+		    }
+		  else if (!strcmp(htype, "fast"))
+		    {
+		      p->fast_nozzles = data[0];
+		      p->min_fast_nozzles = data[1];
+		      p->fast_nozzle_start = data[2];
+		      p->fast_nozzle_separation = data[3];
+		      found_fast_head_config = 1;
+		    }
+		}
+	      else if (!strcmp(name, "margins"))
+		{
+		  const char *itype = stp_mxmlElementGetAttr(tmp, "interleave");
+		  const char *mtype = stp_mxmlElementGetAttr(tmp, "media");
+		  unsigned long data[4];
+		  int i = 0;
+		  while (child && i < 4)
+		    {
+		      if (child->type == STP_MXML_TEXT)
+			data[i++] = stp_xmlstrtoul(child->value.text.string);
+		      child = child->next;
+		    }		      
+		  if (itype && !strcmp(itype, "soft") &&
+		      mtype && !strcmp(mtype, "sheet"))
+		    {
+		      p->left_margin = data[0];
+		      p->right_margin = data[1];
+		      p->top_margin = data[2];
+		      p->bottom_margin = data[3];
+		    }
+		  else if (itype && !strcmp(itype, "printer") &&
+			   mtype && !strcmp(mtype, "sheet"))
+		    {
+		      p->m_left_margin = data[0];
+		      p->m_right_margin = data[1];
+		      p->m_top_margin = data[2];
+		      p->m_bottom_margin = data[3];
+		    }
+		  else if (itype && !strcmp(itype, "soft") &&
+			   mtype && !strcmp(mtype, "roll"))
+		    {
+		      p->roll_left_margin = data[0];
+		      p->roll_right_margin = data[1];
+		      p->roll_top_margin = data[2];
+		      p->roll_bottom_margin = data[3];
+		    }
+		  else if (itype && !strcmp(itype, "printer") &&
+			   mtype && !strcmp(mtype, "roll"))
+		    {
+		      p->m_roll_left_margin = data[0];
+		      p->m_roll_right_margin = data[1];
+		      p->m_roll_top_margin = data[2];
+		      p->m_roll_bottom_margin = data[3];
+		    }
+		}
+	      else if (!strcmp(name, "physicalChannels"))
+		p->physical_channels = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "baseSeparation"))
+		p->base_separation = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "resolutionScale"))
+		p->resolution_scale = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "maxBlackResolution"))
+		p->max_black_resolution = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "minimumResolution"))
+		{
+		  p->min_hres = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->min_vres = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "maximumResolution"))
+		{
+		  p->max_hres = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->max_vres = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "extraVerticalFeed"))
+		p->extra_feed = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "separationRows"))
+		p->separation_rows = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "pseudoSeparationRows"))
+		p->pseudo_separation_rows = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "zeroMarginOffset"))
+		p->zero_margin_offset = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "microLeftMargin"))
+		p->micro_left_margin = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "initialVerticalOffset"))
+		p->initial_vertical_offset = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "blackInitialVerticalOffset"))
+		p->black_initial_vertical_offset = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "extra720DPISeparation"))
+		p->extra_720dpi_separation = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "minHorizontalAlignment"))
+		p->min_horizontal_position_alignment = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "baseHorizontalAlignment"))
+		p->base_horizontal_position_alignment = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "bidirectionalAutoUpperLimit"))
+		p->bidirectional_upper_limit = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "minimumMediaSize"))
+		{
+		  p->min_paper_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->min_paper_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "maximumMediaSize"))
+		{
+		  p->max_paper_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->max_paper_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "maximumImageableArea"))
+		{
+		  p->max_imageable_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->max_imageable_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "CDOffset"))
+		{
+		  p->cd_x_offset = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->cd_y_offset = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "CDMediaSize"))
+		{
+		  p->cd_page_width = stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->cd_page_height = stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "extraBottom"))
+		p->paper_extra_bottom = stp_xmlstrtoul(val);
+	      else if (!strcmp(name, "AlignmentChoices"))
+		{
+		  p->alignment_passes =
+		    stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->alignment_choices =
+		    stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->alternate_alignment_passes =
+		    stp_xmlstrtoul(child->value.text.string);
+		  child = child->next;
+		  p->alternate_alignment_choices =
+		    stp_xmlstrtoul(child->value.text.string);
+		}
+	      else if (!strcmp(name, "ChannelNames"))
+		{
+		  p->channel_names = stp_string_list_create();
+		  while (child)
+		    {
+		      if (child->type == STP_MXML_ELEMENT &&
+			  !strcmp(child->value.element.name, "ChannelName"))
+			{
+			  const char *cname = stp_mxmlElementGetAttr(child, "name");
+			  stp_string_list_add_string(p->channel_names, cname, cname);
+			}
+		      child = child->next;
+		    }
+		}
+	      else if (!strcmp(name, "resolutions"))
+		stp_escp2_load_resolutions_from_xml(v, tmp);
+	    }
+	  else
+	    {
+	      if (!strcmp(name, "supportsVariableDropsizes"))
+		p->flags |= MODEL_VARIABLE_YES;
+	      else if (!strcmp(name, "hasFastGraymode"))
+		p->flags |= MODEL_GRAYMODE_YES;
+	      else if (!strcmp(name, "hasFast360DPI"))
+		p->flags |= MODEL_FAST_360_YES;
+	      else if (!strcmp(name, "sendZeroAdvance"))
+		p->flags |= MODEL_SEND_ZERO_ADVANCE_YES;
+	      else if (!strcmp(name, "supportsInkChange"))
+		p->flags |= MODEL_SUPPORTS_INK_CHANGE_YES;
+	      else if (!strcmp(name, "supportsD4Mode"))
+		p->flags |= MODEL_PACKET_MODE_YES;
+	      else if (!strcmp(name, "hasInterchangeableInkCartridges"))
+		p->flags |= MODEL_INTERCHANGEABLE_INK_YES;
+	      else if (!strcmp(name, "resolutions"))
+		stp_escp2_load_resolutions_from_xml(v, tmp);
+	    }
+	}
+      tmp = tmp->next;
+    }
+}
+
+void
+stp_escp2_load_model(const stp_vars_t *v, int model)
+{
+  stp_list_t *dirlist = stpi_data_path();
+  stp_list_item_t *item;
+  char buf[1024];
+  int found = 0;
+
+  stp_xml_init();
+  sprintf(buf, "escp2/model/model_%d.xml", model);
+  item = stp_list_get_start(dirlist);
+  while (item)
+    {
+      const char *dn = (const char *) stp_list_item_get_data(item);
+      char *fn = stpi_path_merge(dn, buf);
+      stp_mxml_node_t *doc = stp_mxmlLoadFromFile(NULL, fn, STP_MXML_NO_CALLBACK);
+      stp_free(fn);
+      if (doc)
+	{
+	  stp_mxml_node_t *node =
+	    stp_mxmlFindElement(doc, doc, "escp2:model", NULL, NULL,
+				STP_MXML_DESCEND);
+	  if (node)
+	    {
+	      const char *stmp = stp_mxmlElementGetAttr(node, "id");
+	      if (stmp && stp_xmlstrtol(stmp) == model)
+		{
+		  load_model_from_file(v, node, model);
+		  found = 1;
+		}
+	      else
+		{
+		  stp_erprintf("Model id %d does not match definition %s!\n",
+			       model, stmp);
+		  stp_abort();
+		}
+	    }
+	  stp_mxmlDelete(doc);
+	  if (found)
+	    break;
+	}
+      item = stp_list_item_next(item);
+    }
+  stp_xml_exit();
+  stp_list_destroy(dirlist);
+  if (! found)
+    {
+      stp_erprintf("Unable to find printer definition for model %d!\n", model);
+      stp_abort();
+    }
+}
+
+stpi_escp2_printer_t *
+stp_escp2_get_printer(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  if (model < 0)
+    {
+      stp_erprintf("Unable to find printer definition for model %d!\n", model);
+      stp_abort();
+    }
+  if (!escp2_model_capabilities)
+    {
+      escp2_model_capabilities =
+	stp_zalloc(sizeof(stpi_escp2_printer_t) * (model + 1));
+      escp2_model_count = model + 1;
+    }
+  else if (model >= escp2_model_count)
+    {
+      escp2_model_capabilities =
+	stp_realloc(escp2_model_capabilities,
+		    sizeof(stpi_escp2_printer_t) * (model + 1));
+      (void) memset(escp2_model_capabilities + escp2_model_count, 0,
+		    sizeof(stpi_escp2_printer_t) * (model + 1 - escp2_model_count));
+      escp2_model_count = model + 1;
+    }
+  if (!(escp2_model_capabilities[model].active))
+    {
+#ifdef HAVE_LOCALE_H
+      char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+      setlocale(LC_ALL, "C");
+#endif
+      escp2_model_capabilities[model].active = 1;
+      stp_escp2_load_model(v, model);
+#ifdef HAVE_LOCALE_H
+      setlocale(LC_ALL, locale);
+      stp_free(locale);
+#endif
+    }
+  return &(escp2_model_capabilities[model]);
+}
 
-const int stpi_escp2_model_limit =
-sizeof(stpi_escp2_model_capabilities) / sizeof(stpi_escp2_printer_t);
+model_featureset_t
+stp_escp2_get_cap(const stp_vars_t *v, escp2_model_option_t feature)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  model_featureset_t featureset =
+    (((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
+     escp2_printer_attrs[feature].bit_shift);
+  return printdef->flags & featureset;
+}
+
+int
+stp_escp2_has_cap(const stp_vars_t *v, escp2_model_option_t feature,
+		  model_featureset_t class)
+{
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  model_featureset_t featureset =
+    (((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
+     escp2_printer_attrs[feature].bit_shift);
+  return ((printdef->flags & featureset) == class);
+}
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index b00b8d4..1aebc0a 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.387 2008/02/27 02:22:26 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.414 2008/07/26 15:16:15 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -33,7 +33,6 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include "gutenprint-internal.h"
 #include <string.h>
-#include <assert.h>
 #include <math.h>
 #include <limits.h>
 #include "print-escp2.h"
@@ -52,28 +51,6 @@
 
 typedef struct
 {
-  const char *attr_name;
-  short bit_shift;
-  short bit_width;
-} escp2_printer_attr_t;
-
-static const escp2_printer_attr_t escp2_printer_attrs[] =
-{
-  { "command_mode",		0, 4 },
-  { "zero_margin",		4, 2 },
-  { "variable_mode",		6, 1 },
-  { "graymode",		 	7, 1 },
-  { "vacuum",			8, 1 },
-  { "fast_360",			9, 1 },
-  { "send_zero_advance",       10, 1 },
-  { "supports_ink_change",     11, 1 },
-  { "packet_mode",             12, 1 },
-  { "interchangeable_ink",     13, 1 },
-  { "envelope_landscape",      14, 1 },
-};
-
-typedef struct
-{
   unsigned count;
   const char *name;
 } channel_count_t;
@@ -125,27 +102,25 @@ static const double ink_darknesses[] =
 
 #define INCH(x)		(72 * x)
 
-static const res_t *escp2_find_resolution(const stp_vars_t *v);
-
 #define PARAMETER_INT(s)						\
 {									\
   "escp2_" #s, "escp2_" #s, N_("Advanced Printer Functionality"), NULL,	\
   STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,			\
-  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0				\
+  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, STP_CHANNEL_NONE, 1, 0		\
 }
 
 #define PARAMETER_INT_RO(s)						\
 {									\
   "escp2_" #s, "escp2_" #s, N_("Advanced Printer Functionality"), NULL,	\
   STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,			\
-  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 1				\
+  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, STP_CHANNEL_NONE, 1, 1		\
 }
 
 #define PARAMETER_RAW(s)						\
 {									\
   "escp2_" #s, "escp2_" #s, N_("Advanced Printer Functionality"), NULL,	\
   STP_PARAMETER_TYPE_RAW, STP_PARAMETER_CLASS_FEATURE,			\
-  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0				\
+  STP_PARAMETER_LEVEL_INTERNAL, 0, 1, STP_CHANNEL_NONE, 1, 0		\
 }
 
 typedef struct
@@ -157,6 +132,14 @@ typedef struct
   int color_only;
 } float_param_t;
 
+typedef struct
+{
+  const stp_parameter_t param;
+  int min;
+  int max;
+  int defval;
+} int_param_t;
+
 static const stp_parameter_t the_parameters[] =
 {
 #if 0
@@ -164,7 +147,7 @@ static const stp_parameter_t the_parameters[] =
     "AutoMode", N_("Automatic Printing Mode"), N_("Basic Output Adjustment"),
     N_("Automatic printing mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 #endif
   /*
@@ -176,61 +159,67 @@ static const stp_parameter_t the_parameters[] =
     "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
     N_("Print Quality"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
+    N_("Duplex/Tumble Setting"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerRadius", N_("CD Hub Size"), N_("Basic Printer Setup"),
     N_("Print only outside of the hub of the CD, or all the way to the hole"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDOuterDiameter", N_("CD Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment for the outer diameter of CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDInnerDiameter", N_("CD Hub Size (Custom)"), N_("Basic Printer Setup"),
     N_("Variable adjustment to the inner hub of the CD"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDXAdjustment", N_("CD Horizontal Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CDYAdjustment", N_("CD Vertical Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   /*
    * Don't check this parameter.  We may offer different settings for
@@ -241,115 +230,109 @@ static const stp_parameter_t the_parameters[] =
     "InkType", N_("Ink Type"), N_("Advanced Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED2, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_ADVANCED2, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "UseGloss", N_("Enhanced Gloss"), N_("Basic Printer Setup"),
     N_("Add gloss enhancement"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkSet", N_("Ink Set"), N_("Basic Printer Setup"),
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "PrintingDirection", N_("Printing Direction"), N_("Advanced Output Adjustment"),
     N_("Printing direction (unidirectional is higher quality, but slower)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "FullBleed", N_("Borderless"), N_("Basic Printer Setup"),
     N_("Print without borders"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Weave", N_("Interleave Method"), N_("Advanced Output Adjustment"),
     N_("Interleave pattern to use"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, -1, 1, 0
-  },
-  {
-    "AdjustDotsize", N_("Adjust dot size as necessary"), N_("Advanced Printer Setup"),
-    N_("Adjust dot size as necessary to achieve desired density"),
-    STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_ADVANCED4, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_ADVANCED1, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "OutputOrder", N_("Output Order"), N_("Basic Printer Setup"),
     N_("Output Order"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_BASIC, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlignmentPasses", N_("Alignment Passes"), N_("Advanced Printer Functionality"),
     N_("Alignment Passes"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlignmentChoices", N_("Alignment Choices"), N_("Advanced Printer Functionality"),
     N_("Alignment Choices"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkChange", N_("Ink change command"), N_("Advanced Printer Functionality"),
     N_("Ink change command"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlternateAlignmentPasses", N_("Alternate Alignment Passes"), N_("Advanced Printer Functionality"),
     N_("Alternate Alignment Passes"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "AlternateAlignmentChoices", N_("Alternate Alignment Choices"), N_("Advanced Printer Functionality"),
     N_("Alternate Alignment Choices"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "SupportsPacketMode", N_("Supports Packet Mode"), N_("Advanced Printer Functionality"),
     N_("Supports D4 Packet Mode"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InterchangeableInk", N_("Has Interchangeable Ink Cartridges"), N_("Advanced Printer Functionality"),
     N_("Has multiple choices of ink cartridges"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "ChannelNames", N_("Channel Names"), N_("Advanced Printer Functionality"),
     N_("Channel Names"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "RawChannels", N_("Raw Channels"), N_("Core Parameter"),
     N_("Raw Channel Count"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 0, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 0, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "CyanHueCurve", N_("Cyan Map"), N_("Advanced Output Control"),
@@ -376,6 +359,12 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 4, 1, 0
   },
   {
+    "OrangeHueCurve", N_("Orange Map"), N_("Advanced Output Control"),
+    N_("Adjust the orange map"),
+    STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
+    STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 4, 1, 0
+  },
+  {
     "RedHueCurve", N_("Red Map"), N_("Advanced Output Control"),
     N_("Adjust the red map"),
     STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
@@ -391,6 +380,9 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(min_nozzles),
   PARAMETER_INT(min_black_nozzles),
   PARAMETER_INT(min_fast_nozzles),
+  PARAMETER_INT(nozzle_start),
+  PARAMETER_INT(black_nozzle_start),
+  PARAMETER_INT(fast_nozzle_start),
   PARAMETER_INT(nozzle_separation),
   PARAMETER_INT(black_nozzle_separation),
   PARAMETER_INT(fast_nozzle_separation),
@@ -432,6 +424,7 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(cd_page_height),
   PARAMETER_INT(paper_extra_bottom),
   PARAMETER_RAW(preinit_sequence),
+  PARAMETER_RAW(preinit_remote_sequence),
   PARAMETER_RAW(postinit_remote_sequence),
   PARAMETER_RAW(vertical_borderless_sequence)
 };
@@ -491,6 +484,14 @@ static const float_param_t float_parameters[] =
   },
   {
     {
+      "OrangeDensity", N_("Orange Density"), N_("Output Level Adjustment"),
+      N_("Adjust the orange density"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED, 0, 1, 5, 1, 0
+    }, 0.0, 2.0, 1.0, 1
+  },
+  {
+    {
       "GlossLimit", N_("Gloss Level"), N_("Output Level Adjustment"),
       N_("Adjust the gloss level"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
@@ -502,15 +503,15 @@ static const float_param_t float_parameters[] =
       "DropSize1", N_("Drop Size Small"), N_("Advanced Ink Adjustment"),
       N_("Drop Size 1 (small)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
-    }, 0.0, 1.0, 0.0, 1
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 1.0, 1.0, 1
   },
   {
     {
       "DropSize2", N_("Drop Size Medium"), N_("Advanced Ink Adjustment"),
       N_("Drop Size 2 (medium)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 1.0, 0.0, 1
   },
   {
@@ -518,7 +519,7 @@ static const float_param_t float_parameters[] =
       "DropSize3", N_("Drop Size Large"), N_("Advanced Ink Adjustment"),
       N_("Drop Size 3 (large)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 1.0, 0.0, 1
   },
   {
@@ -526,15 +527,15 @@ static const float_param_t float_parameters[] =
       "LightCyanValue", N_("Light Cyan Value"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -542,7 +543,7 @@ static const float_param_t float_parameters[] =
       "LightCyanScale", N_("Light Cyan Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -550,7 +551,7 @@ static const float_param_t float_parameters[] =
       "LightMagentaValue", N_("Light Magenta Value"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -558,15 +559,15 @@ static const float_param_t float_parameters[] =
       "LightMagentaScale", N_("Light Magenta Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -574,15 +575,15 @@ static const float_param_t float_parameters[] =
       "DarkYellowValue", N_("Dark Yellow Value"), N_("Advanced Ink Adjustment"),
       N_("Dark Yellow Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "DarkYellowTransition", N_("Dark Yellow Transition"), N_("Advanced Ink Adjustment"),
+      "DarkYellowTrans", N_("Dark Yellow Transition"), N_("Advanced Ink Adjustment"),
       N_("Dark Yellow Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -590,7 +591,7 @@ static const float_param_t float_parameters[] =
       "DarkYellowScale", N_("Dark Yellow Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Dark Yellow Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -598,15 +599,15 @@ static const float_param_t float_parameters[] =
       "GrayValue", N_("Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "GrayTransition", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
+      "GrayTrans", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -614,7 +615,7 @@ static const float_param_t float_parameters[] =
       "GrayScale", N_("Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -622,15 +623,15 @@ static const float_param_t float_parameters[] =
       "DarkGrayValue", N_("Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "DarkGrayTransition", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
+      "DarkGrayTrans", N_("Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -638,7 +639,7 @@ static const float_param_t float_parameters[] =
       "DarkGrayScale", N_("Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -646,15 +647,15 @@ static const float_param_t float_parameters[] =
       "LightGrayValue", N_("Light Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightGrayTransition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
+      "LightGrayTrans", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -662,7 +663,7 @@ static const float_param_t float_parameters[] =
       "LightGrayScale", N_("Light Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -670,15 +671,15 @@ static const float_param_t float_parameters[] =
       "Gray3Value", N_("Dark Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "Gray3Transition", N_("Dark Gray Transition"), N_("Advanced Ink Adjustment"),
+      "Gray3Trans", N_("Dark Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -686,7 +687,7 @@ static const float_param_t float_parameters[] =
       "Gray3Scale", N_("Dark Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -694,15 +695,15 @@ static const float_param_t float_parameters[] =
       "Gray2Value", N_("Mid Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Medium Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "Gray2Transition", N_("Mid Gray Transition"), N_("Advanced Ink Adjustment"),
+      "Gray2Trans", N_("Mid Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Medium Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -710,7 +711,7 @@ static const float_param_t float_parameters[] =
       "Gray2Scale", N_("Mid Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Medium Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -718,15 +719,15 @@ static const float_param_t float_parameters[] =
       "Gray1Value", N_("Light Gray Value"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Value"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "Gray1Transition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
+      "Gray1Trans", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -734,7 +735,7 @@ static const float_param_t float_parameters[] =
       "Gray1Scale", N_("Light Gray Density Scale"), N_("Advanced Ink Adjustment"),
       N_("Light Gray Density Scale"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
@@ -761,50 +762,96 @@ static const float_param_t float_parameters[] =
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
     }, 0.0, 5.0, 0.5, 1
   },
+  {
+    {
+      "PageDryTime", N_("Drying Time Per Page"), N_("Advanced Printer Functionality"),
+      N_("Set drying time per page"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 60.0, 0.0, 1
+  },
+  {
+    {
+      "ScanDryTime", N_("Drying Time Per Scan"), N_("Advanced Printer Functionality"),
+      N_("Set drying time per scan"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 10.0, 0.0, 1
+  },
+  {
+    {
+      "ScanMinDryTime", N_("Minimum Drying Time Per Scan"), N_("Advanced Printer Functionality"),
+      N_("Set minimum drying time per scan"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 10.0, 0.0, 1
+  },
 };
 
 static const int float_parameter_count =
 sizeof(float_parameters) / sizeof(const float_param_t);
 
 
-static escp2_privdata_t *
-get_privdata(stp_vars_t *v)
+static const int_param_t int_parameters[] =
 {
-  return (escp2_privdata_t *) stp_get_component_data(v, "Driver");
-}
-
-static model_featureset_t
-escp2_get_cap(const stp_vars_t *v, escp2_model_option_t feature)
-{
-  int model = stp_get_model_id(v);
-  if (feature < 0 || feature >= MODEL_LIMIT)
-    return (model_featureset_t) -1;
-  else
+  {
     {
-      model_featureset_t featureset =
-	(((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
-	 escp2_printer_attrs[feature].bit_shift);
-      return stpi_escp2_model_capabilities[model].flags & featureset;
-    }
-}
+      "PaperThickness", N_("Paper Thickness"), N_("Advanced Printer Functionality"),
+      N_("Set printer paper thickness"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "VacuumIntensity", N_("Vacuum Intensity"), N_("Advanced Printer Functionality"),
+      N_("Set vacuum intensity (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "FeedSequence", N_("Feed Sequence"), N_("Advanced Printer Functionality"),
+      N_("Set paper feed sequence (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "PrintMethod", N_("Print Method"), N_("Advanced Printer Functionality"),
+      N_("Set print method (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "PlatenGap", N_("Platen Gap"), N_("Advanced Printer Functionality"),
+      N_("Set platen gap (printer-specific)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+  {
+    {
+      "FeedAdjustment", N_("Feed Adjustment"), N_("Advanced Printer Functionality"),
+      N_("Set paper feed adjustment (0.01% units)"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 255, 0
+  },
+};
 
-static int
-escp2_has_cap(const stp_vars_t *v, escp2_model_option_t feature,
-	      model_featureset_t class)
+static const int int_parameter_count =
+sizeof(int_parameters) / sizeof(const int_param_t);
+
+
+static escp2_privdata_t *
+get_privdata(stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  if (feature < 0 || feature >= MODEL_LIMIT)
-    return -1;
-  else
-    {
-      model_featureset_t featureset =
-	(((1ul << escp2_printer_attrs[feature].bit_width) - 1ul) <<
-	 escp2_printer_attrs[feature].bit_shift);
-      if ((stpi_escp2_model_capabilities[model].flags & featureset) == class)
-	return 1;
-      else
-	return 0;
-    }
+  return (escp2_privdata_t *) stp_get_component_data(v, "Driver");
 }
 
 #define DEF_SIMPLE_ACCESSOR(f, t)					\
@@ -815,8 +862,8 @@ escp2_##f(const stp_vars_t *v)						\
     return stp_get_int_parameter(v, "escp2_" #f);			\
   else									\
     {									\
-      int model = stp_get_model_id(v);					\
-      return (stpi_escp2_model_capabilities[model].f);			\
+      stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);	\
+      return printdef->f;						\
     }									\
 }
 
@@ -828,8 +875,8 @@ escp2_##f(const stp_vars_t *v)						\
     return stp_get_raw_parameter(v, "escp2_" #f);			\
   else									\
     {									\
-      int model = stp_get_model_id(v);					\
-      return (stpi_escp2_model_capabilities[model].f);			\
+      stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);	\
+      return printdef->f;						\
     }									\
 }
 
@@ -841,21 +888,21 @@ escp2_##f(const stp_vars_t *v, int rollfeed)				\
     return stp_get_int_parameter(v, "escp2_" #f);			\
   else									\
     {									\
-      int model = stp_get_model_id(v);					\
-      const res_t *res = escp2_find_resolution(v);			\
-      if (res && !(res->softweave))					\
+      stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);	\
+      const res_t *res = stp_escp2_find_resolution(v);			\
+      if (res && res->command)						\
 	{								\
 	  if (rollfeed)							\
-	    return (stpi_escp2_model_capabilities[model].m_roll_##f);	\
+	    return (printdef->m_roll_##f);				\
 	  else								\
-	    return (stpi_escp2_model_capabilities[model].m_##f);	\
+	    return (printdef->m_##f);					\
 	}								\
       else								\
 	{								\
 	  if (rollfeed)							\
-	    return (stpi_escp2_model_capabilities[model].roll_##f);	\
+	    return (printdef->roll_##f);				\
 	  else								\
-	    return (stpi_escp2_model_capabilities[model].f);		\
+	    return (printdef->f);					\
 	}								\
     }									\
 }
@@ -870,6 +917,9 @@ DEF_SIMPLE_ACCESSOR(fast_nozzles, unsigned)
 DEF_SIMPLE_ACCESSOR(min_nozzles, unsigned)
 DEF_SIMPLE_ACCESSOR(min_black_nozzles, unsigned)
 DEF_SIMPLE_ACCESSOR(min_fast_nozzles, unsigned)
+DEF_SIMPLE_ACCESSOR(nozzle_start, int)
+DEF_SIMPLE_ACCESSOR(black_nozzle_start, int)
+DEF_SIMPLE_ACCESSOR(fast_nozzle_start, int)
 DEF_SIMPLE_ACCESSOR(nozzle_separation, unsigned)
 DEF_SIMPLE_ACCESSOR(black_nozzle_separation, unsigned)
 DEF_SIMPLE_ACCESSOR(fast_nozzle_separation, unsigned)
@@ -910,56 +960,44 @@ DEF_ROLL_ACCESSOR(top_margin, unsigned)
 DEF_ROLL_ACCESSOR(bottom_margin, unsigned)
 
 DEF_RAW_ACCESSOR(preinit_sequence, const stp_raw_t *)
+DEF_RAW_ACCESSOR(preinit_remote_sequence, const stp_raw_t *)
 DEF_RAW_ACCESSOR(postinit_remote_sequence, const stp_raw_t *)
 
 DEF_RAW_ACCESSOR(vertical_borderless_sequence, const stp_raw_t *)
 
-static inline const res_t *const *
+static const resolution_list_t *
 escp2_reslist(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_reslist_named
-	  (stpi_escp2_model_capabilities[model].reslist));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->resolutions;
 }
 
 static inline const printer_weave_list_t *
 escp2_printer_weaves(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_printer_weaves_named
-	  (stpi_escp2_model_capabilities[model].printer_weaves));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->printer_weaves;
 }
 
-static inline const channel_name_t *
+static inline const stp_string_list_t *
 escp2_channel_names(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_channel_names_named
-	  (stpi_escp2_model_capabilities[model].channel_names));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return (printdef->channel_names);
 }
 
 static inline const inkgroup_t *
 escp2_inkgroup(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_inkgroup_named
-	  (stpi_escp2_model_capabilities[model].inkgroup));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return (printdef->inkgroup);
 }
 
 static inline const quality_list_t *
 escp2_quality_list(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_quality_list_named
-	  (stpi_escp2_model_capabilities[model].quality_list));
-}
-
-static inline const input_slot_list_t *
-escp2_input_slots(const stp_vars_t *v)
-{
-  int model = stp_get_model_id(v);
-  return (stpi_escp2_get_input_slot_list_named
-	  (stpi_escp2_model_capabilities[model].input_slots));
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->quality_list;
 }
 
 static const channel_count_t *
@@ -983,74 +1021,116 @@ get_channel_count_by_number(unsigned count)
 }
 
 static int
-escp2_ink_type(const stp_vars_t *v, int resid)
+escp2_res_param(const stp_vars_t *v, const char *param, const res_t *res)
 {
-  if (stp_check_int_parameter(v, "escp2_ink_type", STP_PARAMETER_ACTIVE))
-    return stp_get_int_parameter(v, "escp2_ink_type");
+  if (res)
+    {
+      if (res->v &&
+	  stp_check_int_parameter(res->v, param, STP_PARAMETER_ACTIVE))
+	return stp_get_int_parameter(res->v, param);
+      else
+	return -1;
+    }
+  if (stp_check_int_parameter(v, param, STP_PARAMETER_ACTIVE))
+    return stp_get_int_parameter(v, param);
   else
     {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].dot_sizes[resid];
+      const res_t *res1 = stp_escp2_find_resolution(v);
+      if (res1->v &&
+	  stp_check_int_parameter(res1->v, param, STP_PARAMETER_ACTIVE))
+	return stp_get_int_parameter(res1->v, param);
     }
+  return -1;
+}
+
+static int
+escp2_ink_type(const stp_vars_t *v)
+{
+  return escp2_res_param(v, "escp2_ink_type", NULL);
 }
 
 static double
-escp2_density(const stp_vars_t *v, int resid)
+escp2_density(const stp_vars_t *v)
 {
   if (stp_check_float_parameter(v, "escp2_density", STP_PARAMETER_ACTIVE))
     return stp_get_float_parameter(v, "escp2_density");
   else
     {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].densities[resid];
+      const res_t *res1 = stp_escp2_find_resolution(v);
+      if (res1->v &&
+	  stp_check_float_parameter(res1->v, "escp2_density", STP_PARAMETER_ACTIVE))
+	return stp_get_float_parameter(res1->v, "escp2_density");
     }
+  return 0;
 }
 
 static int
-escp2_bits(const stp_vars_t *v, int resid)
+escp2_bits(const stp_vars_t *v)
 {
-  if (stp_check_int_parameter(v, "escp2_bits", STP_PARAMETER_ACTIVE))
-    return stp_get_int_parameter(v, "escp2_bits");
-  else
-    {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].bits[resid];
-    }
+  return escp2_res_param(v, "escp2_bits", NULL);
 }
 
 static int
-escp2_base_res(const stp_vars_t *v, int resid)
+escp2_base_res(const stp_vars_t *v)
 {
-  if (stp_check_int_parameter(v, "escp2_base_res", STP_PARAMETER_ACTIVE))
-    return stp_get_int_parameter(v, "escp2_base_res");
-  else
+  return escp2_res_param(v, "escp2_base_res", NULL);
+}
+
+static int
+escp2_ink_type_by_res(const stp_vars_t *v, const res_t *res)
+{
+  return escp2_res_param(v, "escp2_ink_type", res);
+}
+
+static double
+escp2_density_by_res(const stp_vars_t *v, const res_t *res)
+{
+  if (res)
     {
-      int model = stp_get_model_id(v);
-      return stpi_escp2_model_capabilities[model].base_resolutions[resid];
+      if (res->v &&
+	  stp_check_float_parameter(res->v, "escp2_density", STP_PARAMETER_ACTIVE))
+	return stp_get_float_parameter(res->v, "escp2_density");
     }
+  return 0.0;
+}
+
+static int
+escp2_bits_by_res(const stp_vars_t *v, const res_t *res)
+{
+  return escp2_res_param(v, "escp2_bits", res);
 }
 
-static const escp2_dropsize_t *
-escp2_dropsizes(const stp_vars_t *v, int resid)
+static int
+escp2_base_res_by_res(const stp_vars_t *v, const res_t *res)
 {
-  int model = stp_get_model_id(v);
-  const escp2_drop_list_t *drops =
-    stpi_escp2_get_drop_list_named(stpi_escp2_model_capabilities[model].drops);
-  return (*drops)[resid];
+  return escp2_res_param(v, "escp2_base_res", res);
 }
 
 static escp2_dropsize_t *
-escp2_copy_dropsizes(const stp_vars_t *v, int resid)
+escp2_copy_dropsizes(const stp_vars_t *v)
 {
-  const escp2_dropsize_t *drops = escp2_dropsizes(v, resid);
-  int i;
-  escp2_dropsize_t *ndrops = stp_zalloc(sizeof(escp2_dropsize_t));
-  if (! drops)
+  const res_t *res = stp_escp2_find_resolution(v);
+  escp2_dropsize_t *ndrops;
+  if (!res || !(res->v))
     return NULL;
-  ndrops->listname = drops->listname;
-  ndrops->numdropsizes = drops->numdropsizes;
-  for (i = 0; i < drops->numdropsizes; i++)
-    ndrops->dropsizes[i] = drops->dropsizes[i];
+  ndrops = stp_zalloc(sizeof(escp2_dropsize_t));
+  if (! ndrops)
+    return NULL;
+  if (stp_check_float_parameter(res->v, "DropSize1", STP_PARAMETER_ACTIVE))
+    {
+      ndrops->numdropsizes = 1;
+      ndrops->dropsizes[0] = stp_get_float_parameter(res->v, "DropSize1");
+    }
+  if (stp_check_float_parameter(res->v, "DropSize2", STP_PARAMETER_ACTIVE))
+    {
+      ndrops->numdropsizes = 2;
+      ndrops->dropsizes[1] = stp_get_float_parameter(res->v, "DropSize2");
+    }
+  if (stp_check_float_parameter(res->v, "DropSize3", STP_PARAMETER_ACTIVE))
+    {
+      ndrops->numdropsizes = 3;
+      ndrops->dropsizes[2] = stp_get_float_parameter(res->v, "DropSize3");
+    }
   return ndrops;
 }
 
@@ -1061,8 +1141,8 @@ escp2_free_dropsizes(escp2_dropsize_t *drops)
     stp_free(drops);
 }
 
-static const inklist_t *
-escp2_inklist(const stp_vars_t *v)
+const inklist_t *
+stp_escp2_inklist(const stp_vars_t *v)
 {
   int i;
   const char *ink_list_name = NULL;
@@ -1074,32 +1154,39 @@ escp2_inklist(const stp_vars_t *v)
     {
       for (i = 0; i < inkgroup->n_inklists; i++)
 	{
-	  if (strcmp(ink_list_name, inkgroup->inklists[i]->name) == 0)
-	    return inkgroup->inklists[i];
+	  if (strcmp(ink_list_name, inkgroup->inklists[i].name) == 0)
+	    return &(inkgroup->inklists[i]);
 	}
     }
-  return inkgroup->inklists[0];
+  if (!inkgroup)
+    {
+      stp_erprintf("Cannot find inks for printer %s!\n",
+		   stp_get_driver(v));
+      stp_abort();
+    }
+  return &(inkgroup->inklists[0]);
 }
 
 static const shade_t *
 escp2_shades(const stp_vars_t *v, int channel)
 {
-  const inklist_t *inklist = escp2_inklist(v);
-  return &((*inklist->shades)[channel]);
+  const inklist_t *inklist = stp_escp2_inklist(v);
+  return &(inklist->shades[channel]);
 }
 
 static shade_t *
 escp2_copy_shades(const stp_vars_t *v, int channel)
 {
-  const shade_t *shades = escp2_shades(v, channel);
   int i;
   shade_t *nshades;
-  if (! shades)
+  const inklist_t *inklist = stp_escp2_inklist(v);
+  if (!inklist)
     return NULL;
   nshades = stp_zalloc(sizeof(shade_t));
-  nshades->n_shades = shades->n_shades;
-  for (i = 0; i < shades->n_shades; i++)
-    nshades->shades[i] = shades->shades[i];
+  nshades->n_shades = inklist->shades[channel].n_shades;
+  nshades->shades = stp_zalloc(sizeof(double) * inklist->shades[channel].n_shades);
+  for (i = 0; i < inklist->shades[channel].n_shades; i++)
+    nshades->shades[i] = inklist->shades[channel].shades[i];
   return nshades;
 }
 
@@ -1107,73 +1194,33 @@ static void
 escp2_free_shades(shade_t *shades)
 {
   if (shades)
-    stp_free(shades);
-}
-
-static const paperlist_t *
-escp2_paperlist(const stp_vars_t *v)
-{
-  const inklist_t *inklist = escp2_inklist(v);
-  if (inklist)
-    return stpi_escp2_get_paperlist_named(inklist->papers);
-  else
-    return NULL;
-}
-
-static int
-supports_borderless(const stp_vars_t *v)
-{
-  return (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) ||
-	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) ||
-	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY));
-}
-
-static int
-compute_internal_resid(int hres, int vres)
-{
-  static const int resolutions[RES_N] =
-    {
-      0,
-      360 * 360,
-      720 * 360,
-      720 * 720,
-      1440 * 720,
-      1440 * 1440,
-      2880 * 1440,
-      2880 * 2880,
-      5760 * 2880,
-    };
-  int total_resolution = hres * vres;
-  int i;
-  for (i = 0; i < RES_N; i++)
     {
-      if (total_resolution < resolutions[i])
-	return i - 1;
+      if (shades->shades)
+	stp_free(shades->shades);
+      stp_free(shades);
     }
-  return RES_N - 1;
 }
 
-static int
-compute_resid(const res_t *res)
+static const stp_string_list_t *
+escp2_paperlist(const stp_vars_t *v)
 {
-  return compute_internal_resid(res->hres, res->vres);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->papers;
 }
 
-static int
-compute_printed_resid(const res_t *res)
+static const stp_string_list_t *
+escp2_slotlist(const stp_vars_t *v)
 {
-  return compute_internal_resid(res->printed_hres, res->printed_vres);
+  stpi_escp2_printer_t *printdef = stp_escp2_get_printer(v);
+  return printdef->input_slots;
 }
 
 static int
-compute_virtual_resid(const res_t *res)
+supports_borderless(const stp_vars_t *v)
 {
-  int virtual = compute_internal_resid(res->virtual_hres, res->virtual_vres);
-  int normal = compute_internal_resid(res->hres, res->vres);
-  if (normal == virtual)
-    return compute_internal_resid(res->printed_hres, res->printed_vres);
-  else
-    return virtual;
+  return (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) ||
+	  stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) ||
+	  stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY));
 }
 
 static int
@@ -1191,34 +1238,11 @@ max_nozzle_span(const stp_vars_t *v)
     return nozzle_span;
 }
 
-static const input_slot_t *
-get_input_slot(const stp_vars_t *v)
-{
-  int i;
-  const char *input_slot = stp_get_string_parameter(v, "InputSlot");
-  if (input_slot && strlen(input_slot) > 0)
-    {
-      const input_slot_list_t *slots = escp2_input_slots(v);
-      if (slots)
-	{
-	  for (i = 0; i < slots->n_input_slots; i++)
-	    {
-	      if (slots->slots[i].name &&
-		  strcmp(input_slot, slots->slots[i].name) == 0)
-		{
-		  return &(slots->slots[i]);
-		  break;
-		}
-	    }
-	}
-    }
-  return NULL;
-}
-
-static const printer_weave_t *
+static const stp_raw_t *
 get_printer_weave(const stp_vars_t *v)
 {
   int i;
+  const res_t *res = stp_escp2_find_resolution(v);
   const printer_weave_list_t *p = escp2_printer_weaves(v);
   if (p)
     {
@@ -1229,47 +1253,20 @@ get_printer_weave(const stp_vars_t *v)
 	  for (i = 0; i < printer_weave_count; i++)
 	    {
 	      if (!strcmp(name, p->printer_weaves[i].name))
-		return &(p->printer_weaves[i]);
+		return p->printer_weaves[i].command;
 	    }
 	}
     }
+  if (res)
+    return res->command;
   return NULL;
 }
 
 static int
 use_printer_weave(const stp_vars_t *v)
 {
-  const res_t *res = escp2_find_resolution(v);
-  if (!res)
-    return 1;
-  else if (!(res->softweave))
-    return 1;
-  else if (res->printer_weave)
-    return 1;
-  else
-    return 0;
-}
-
-
-static const paper_t *
-get_media_type(const stp_vars_t *v)
-{
-  int i;
-  const paperlist_t *p = escp2_paperlist(v);
-  if (p)
-    {
-      const char *name = stp_get_string_parameter(v, "MediaType");
-      int paper_type_count = p->paper_count;
-      if (name)
-	{
-	  for (i = 0; i < paper_type_count; i++)
-	    {
-	      if (!strcmp(name, p->papers[i].name))
-		return &(p->papers[i]);
-	    }
-	}
-    }
-  return NULL;
+  const res_t *res = stp_escp2_find_resolution(v);
+  return (!res || res->command);
 }
 
 static void
@@ -1277,7 +1274,7 @@ get_resolution_bounds_by_paper_type(const stp_vars_t *v,
 				    unsigned *max_x, unsigned *max_y,
 				    unsigned *min_x, unsigned *min_y)
 {
-  const paper_t *paper = get_media_type(v);
+  const paper_t *paper = stp_escp2_get_media_type(v, 1);
   *min_x = 0;
   *min_y = 0;
   *max_x = 0;
@@ -1363,7 +1360,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
   int nozzle_width =
     (escp2_base_separation(v) / escp2_nozzle_separation(v));
   int nozzles = escp2_nozzles(v);
-  if (escp2_ink_type(v, compute_printed_resid(res)) != -1 &&
+  if (escp2_ink_type_by_res(v, res) != -1 &&
       res->vres <= escp2_max_vres(v) &&
       res->hres <= escp2_max_hres(v) &&
       res->vres >= escp2_min_vres(v) &&
@@ -1372,7 +1369,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
        ((res->vres / nozzle_width) * nozzle_width) == res->vres))
     {
       int xdpi = res->hres;
-      int physical_xdpi = escp2_base_res(v, compute_virtual_resid(res));
+      int physical_xdpi = escp2_base_res_by_res(v, res);
       int horizontal_passes, oversample;
       if (physical_xdpi > xdpi)
 	physical_xdpi = xdpi;
@@ -1383,7 +1380,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
       if (oversample < 1)
 	oversample = 1;
       if (((horizontal_passes * res->vertical_passes) <= STP_MAX_WEAVE) &&
-	  (! res->softweave || (nozzles > 1 && nozzles > oversample)))
+	  (res->command || (nozzles > 1 && nozzles > oversample)))
 	return 1;
     }
   return 0;
@@ -1395,64 +1392,38 @@ get_printer_resolution_bounds(const stp_vars_t *v,
 			      unsigned *min_x, unsigned *min_y)
 {
   int i = 0;
-  const res_t *const *res = escp2_reslist(v);
+  const resolution_list_t *resolutions = escp2_reslist(v);
   *max_x = 0;
   *max_y = 0;
   *min_x = 0;
   *min_y = 0;
-  while (res[i])
+  for (i = 0; i < resolutions->n_resolutions; i++)
     {
-      if (verify_resolution(v, res[i]))
+      res_t *res = &(resolutions->resolutions[i]);
+      if (verify_resolution(v, res))
 	{
-	  if (res[i]->printed_hres * res[i]->vertical_passes > *max_x)
-	    *max_x = res[i]->printed_hres * res[i]->vertical_passes;
-	  if (res[i]->printed_vres > *max_y)
-	    *max_y = res[i]->printed_vres;
+	  if (res->printed_hres * res->vertical_passes > *max_x)
+	    *max_x = res->printed_hres * res->vertical_passes;
+	  if (res->printed_vres > *max_y)
+	    *max_y = res->printed_vres;
 	  if (*min_x == 0 ||
-	      res[i]->printed_hres * res[i]->vertical_passes < *min_x)
-	    *min_x = res[i]->printed_hres * res[i]->vertical_passes;
-	  if (*min_y == 0 || res[i]->printed_vres < *min_y)
-	    *min_y = res[i]->printed_vres;
+	      res->printed_hres * res->vertical_passes < *min_x)
+	    *min_x = res->printed_hres * res->vertical_passes;
+	  if (*min_y == 0 || res->printed_vres < *min_y)
+	    *min_y = res->printed_vres;
 	}
-      i++;
     }
   stp_dprintf(STP_DBG_ESCP2, v,
 	      "Printer bounds: %d %d %d %d\n", *min_x, *min_y, *max_x, *max_y);
 }
 
 static int
-printer_supports_rollfeed(const stp_vars_t *v)
-{
-  int i;
-  const input_slot_list_t *slots = escp2_input_slots(v);
-  for (i = 0; i < slots->n_input_slots; i++)
-    {
-      if (slots->slots[i].is_roll_feed)
-	return 1;
-    }
-  return 0;
-}
-
-static int
-printer_supports_print_to_cd(const stp_vars_t *v)
-{
-  int i;
-  const input_slot_list_t *slots = escp2_input_slots(v);
-  for (i = 0; i < slots->n_input_slots; i++)
-    {
-      if (slots->slots[i].is_cd)
-	return 1;
-    }
-  return 0;
-}
-
-static int
 verify_papersize(const stp_vars_t *v, const stp_papersize_t *pt)
 {
   unsigned int height_limit, width_limit;
   unsigned int min_height_limit, min_width_limit;
   unsigned int envelope_landscape =
-    escp2_has_cap(v, MODEL_ENVELOPE_LANDSCAPE, MODEL_ENVELOPE_LANDSCAPE_YES);
+    stp_escp2_has_cap(v, MODEL_ENVELOPE_LANDSCAPE, MODEL_ENVELOPE_LANDSCAPE_YES);
   width_limit = escp2_max_paper_width(v);
   height_limit = escp2_max_paper_height(v);
   min_width_limit = escp2_min_paper_width(v);
@@ -1463,14 +1434,15 @@ verify_papersize(const stp_vars_t *v, const stp_papersize_t *pt)
       pt->width <= width_limit && pt->height <= height_limit &&
       (pt->height >= min_height_limit || pt->height == 0) &&
       (pt->width >= min_width_limit || pt->width == 0) &&
-      (pt->width == 0 || pt->height > 0 || printer_supports_rollfeed(v)))
+      (pt->width == 0 || pt->height > 0 ||
+       stp_escp2_printer_supports_rollfeed(v)))
     return 1;
   else
     return 0;
 }
 
 static int
-verify_inktype(const stp_vars_t *v, const escp2_inkname_t *inks)
+verify_inktype(const stp_vars_t *v, const inkname_t *inks)
 {
   if (inks->inkset == INKSET_EXTENDED)
     return 0;
@@ -1481,43 +1453,39 @@ verify_inktype(const stp_vars_t *v, const escp2_inkname_t *inks)
 static const char *
 get_default_inktype(const stp_vars_t *v)
 {
-  const inklist_t *ink_list = escp2_inklist(v);
-  const paper_t *paper_type = get_media_type(v);
+  const inklist_t *ink_list = stp_escp2_inklist(v);
+  const paper_t *paper_type;
   if (!ink_list)
     return NULL;
+  paper_type = stp_escp2_get_media_type(v, 0);
   if (!paper_type)
-    {
-      const paperlist_t *p = escp2_paperlist(v);
-      if (p)
-	paper_type = &(p->papers[0]);
-    }
+    paper_type = stp_escp2_get_default_media_type(v);
   if (paper_type && paper_type->preferred_ink_type)
     return paper_type->preferred_ink_type;
-  else if (escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
+  else if (stp_escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
 	   stp_check_string_parameter(v, "Resolution", STP_PARAMETER_ACTIVE))
     {
-      const res_t *res = escp2_find_resolution(v);
+      const res_t *res = stp_escp2_find_resolution(v);
       if (res)
 	{
-	  int resid = compute_printed_resid(res);
-	  if (res->vres == 360 && res->hres == escp2_base_res(v, resid))
+	  if (res->vres == 360 && res->hres == escp2_base_res(v))
 	    {
 	      int i;
 	      for (i = 0; i < ink_list->n_inks; i++)
-		if (strcmp(ink_list->inknames[i]->name, "CMYK") == 0)
-		  return ink_list->inknames[i]->name;
+		if (strcmp(ink_list->inknames[i].name, "CMYK") == 0)
+		  return ink_list->inknames[i].name;
 	    }
 	}
     }
-  return ink_list->inknames[0]->name;
+  return ink_list->inknames[0].name;
 }
 
 
-static const escp2_inkname_t *
+static const inkname_t *
 get_inktype(const stp_vars_t *v)
 {
   const char	*ink_type = stp_get_string_parameter(v, "InkType");
-  const inklist_t *ink_list = escp2_inklist(v);
+  const inklist_t *ink_list = stp_escp2_inklist(v);
   int i;
 
   if (!ink_type || strcmp(ink_type, "None") == 0 ||
@@ -1528,8 +1496,8 @@ get_inktype(const stp_vars_t *v)
     {
       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 (strcmp(ink_type, ink_list->inknames[i].name) == 0)
+	    return &(ink_list->inknames[i]);
 	}
     }
   /*
@@ -1539,36 +1507,25 @@ get_inktype(const stp_vars_t *v)
   ink_type = get_default_inktype(v);
   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 (strcmp(ink_type, ink_list->inknames[i].name) == 0)
+	return &(ink_list->inknames[i]);
     }
-  return NULL;
+  /*
+   * If even *that* doesn't work, try using the first ink type on the list.
+   */
+  return &(ink_list->inknames[0]);
 }
 
-static const paper_adjustment_t *
+static const stp_vars_t *
 get_media_adjustment(const stp_vars_t *v)
 {
-  const paper_t *pt = get_media_type(v);
-  const inklist_t *ink_list = escp2_inklist(v);
-  if (pt && ink_list && ink_list->paper_adjustments)
-    {
-      const paper_adjustment_list_t *adjlist =
-	stpi_escp2_get_paper_adjustment_list_named(ink_list->paper_adjustments);
-      if (adjlist)
-	{
-	  const char *paper_name = pt->name;
-	  int i;
-	  for (i = 0; i < adjlist->paper_count; i++)
-	    {
-	      if (strcmp(paper_name, adjlist->papers[i].name) == 0)
-		return &(adjlist->papers[i]);
-	    }
-	}
-    }
-  return NULL;
+  const paper_t *pt = stp_escp2_get_media_type(v, 0);
+  if (pt)
+    return pt->v;
+  else
+    return NULL;
 }
 
-
 /*
  * 'escp2_parameters()' - Return the parameter values for the given parameter.
  */
@@ -1582,27 +1539,40 @@ escp2_list_parameters(const stp_vars_t *v)
     stp_parameter_list_add_param(ret, &(the_parameters[i]));
   for (i = 0; i < float_parameter_count; i++)
     stp_parameter_list_add_param(ret, &(float_parameters[i].param));
+  for (i = 0; i < int_parameter_count; i++)
+    stp_parameter_list_add_param(ret, &(int_parameters[i].param));
   return ret;
 }
 
 static void
 set_density_parameter(const stp_vars_t *v,
 		      stp_parameter_t *description,
-		      int color)
+		      const char *name)
 {
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (stp_get_string_parameter(v, "PrintingMode") &&
+  if (ink_name && stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name &&
-	  ink_name->channel_set->channel_count > color &&
-	  ink_name->channel_set->channels[color])
+      int i, j;
+      for (i = 0; i < ink_name->channel_count; i++)
 	{
-	  description->is_active = 1;
-	  description->bounds.dbl.lower = 0;
-	  description->bounds.dbl.upper = 2.0;
-	  description->deflt.dbl = 1.0;
+	  ink_channel_t *ich = &(ink_name->channels[i]);
+	  if (ich)
+	    {
+	      for (j = 0; j < ich->n_subchannels; j++)
+		{
+		  physical_subchannel_t *sch = &(ich->subchannels[j]);
+		  if (sch && sch->channel_density &&
+		      !strcmp(name, sch->channel_density))
+		    {
+		      description->is_active = 1;
+		      description->bounds.dbl.lower = 0;
+		      description->bounds.dbl.upper = 2.0;
+		      description->deflt.dbl = 1.0;
+		    }
+		}
+	    }
 	}
     }
 }
@@ -1610,28 +1580,24 @@ set_density_parameter(const stp_vars_t *v,
 static void
 set_hue_map_parameter(const stp_vars_t *v,
 		      stp_parameter_t *description,
-		      int color)
+		      const char *name)
 {
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
   description->deflt.curve = hue_curve_bounds;
   description->bounds.curve = stp_curve_create_copy(hue_curve_bounds);
-  if (stp_get_string_parameter(v, "PrintingMode") &&
+  if (ink_name && stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name &&
-	  ink_name->channel_set->channel_count > color &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->hue_curve &&
-	  ink_name->channel_set->channels[color]->hue_curve->curve)
-	{
-	  if (!ink_name->channel_set->channels[color]->hue_curve->curve_impl)
-	    ink_name->channel_set->channels[color]->hue_curve->curve_impl =
-	      stp_curve_create_from_string
-	      (ink_name->channel_set->channels[color]->hue_curve->curve);
-	  description->deflt.curve =
-	    ink_name->channel_set->channels[color]->hue_curve->curve_impl;
-	  description->is_active = 1;
+      int i;
+      for (i = 0; i < ink_name->channel_count; i++)
+	{
+	  ink_channel_t *ich = &(ink_name->channels[i]);
+	  if (ich && ich->hue_curve && !strcmp(name, ich->hue_curve_name))
+	    {
+	      description->deflt.curve = ich->hue_curve;
+	      description->is_active = 1;
+	    }
 	}
     }
 }
@@ -1642,14 +1608,14 @@ fill_value_parameters(const stp_vars_t *v,
 		      int color)
 {
   const shade_t *shades = escp2_shades(v, color);
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 1;
   description->bounds.dbl.lower = 0;
   description->bounds.dbl.upper = 1.0;
   description->deflt.dbl = 1.0;
   if (shades && ink_name)
     {
-      const ink_channel_t *channel = ink_name->channel_set->channels[color];
+      const ink_channel_t *channel = &(ink_name->channels[color]);
       int i;
       for (i = 0; i < channel->n_subchannels; i++)
 	{
@@ -1673,11 +1639,10 @@ set_color_value_parameter(const stp_vars_t *v,
   if (stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
+      const inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
-	  ink_name->channel_set->channel_count == 4 &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->n_subchannels == 2)
+	  ink_name->channel_count == 4 &&
+	  ink_name->channels[color].n_subchannels == 2)
 	fill_value_parameters(v, description, color);
     }
 }
@@ -1687,10 +1652,10 @@ set_gray_value_parameter(const stp_vars_t *v,
 			 stp_parameter_t *description,
 			 int expected_channels)
 {
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+  if (ink_name && 
+      (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_value_parameters(v, description, STP_ECOLOR_K);
   else
@@ -1699,15 +1664,15 @@ set_gray_value_parameter(const stp_vars_t *v,
 
 static void
 fill_transition_parameters(const stp_vars_t *v,
-			       stp_parameter_t *description,
-			       int color)
+			   stp_parameter_t *description,
+			   int color)
 {
-  const paper_adjustment_t *paper_adj = get_media_adjustment(v);
+  const stp_vars_t *paper_adj = get_media_adjustment(v);
   description->is_active = 1;
   description->bounds.dbl.lower = 0;
   description->bounds.dbl.upper = 1.0;
-  if (paper_adj)
-    description->deflt.dbl = paper_adj->subchannel_cutoff;
+  if (paper_adj && stp_check_float_parameter(paper_adj, "SubchannelCutoff", STP_PARAMETER_ACTIVE))
+    description->deflt.dbl = stp_get_float_parameter(paper_adj, "SubchannelCutoff");
   else
     description->deflt.dbl = 1.0;
 }
@@ -1721,11 +1686,10 @@ set_color_transition_parameter(const stp_vars_t *v,
   if (stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
+      const inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
-	  ink_name->channel_set->channel_count == 4 &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->n_subchannels == 2)
+	  ink_name->channel_count == 4 &&
+	  ink_name->channels[color].n_subchannels == 2)
 	fill_transition_parameters(v, description, color);
     }
 }
@@ -1735,10 +1699,10 @@ set_gray_transition_parameter(const stp_vars_t *v,
 			      stp_parameter_t *description,
 			      int expected_channels)
 {
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+  if (ink_name && 
+      (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_transition_parameters(v, description, STP_ECOLOR_K);
   else
@@ -1763,11 +1727,10 @@ set_color_scale_parameter(const stp_vars_t *v,
   if (stp_get_string_parameter(v, "PrintingMode") &&
       strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
+      const inkname_t *ink_name = get_inktype(v);
       if (ink_name &&
-	  ink_name->channel_set->channel_count == 4 &&
-	  ink_name->channel_set->channels[color] &&
-	  ink_name->channel_set->channels[color]->n_subchannels == 2)
+	  ink_name->channel_count == 4 &&
+	  ink_name->channels[color].n_subchannels == 2)
 	fill_scale_parameters(description);
     }
 }
@@ -1777,10 +1740,10 @@ set_gray_scale_parameter(const stp_vars_t *v,
 			      stp_parameter_t *description,
 			      int expected_channels)
 {
-  const escp2_inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype(v);
   description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+  if (ink_name &&
+      (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_scale_parameters(description);
   else
@@ -1788,31 +1751,27 @@ set_gray_scale_parameter(const stp_vars_t *v,
 }
 
 static const res_t *
-find_default_resolution(const stp_vars_t *v, const quality_t *q,
-			int strict)
+find_default_resolution(const stp_vars_t *v, const quality_t *q, int strict)
 {
-  const res_t *const *res = escp2_reslist(v);
+  const resolution_list_t *resolutions = escp2_reslist(v);
   int i = 0;
   stp_dprintf(STP_DBG_ESCP2, v, "Quality %s: min %d %d max %d %d, des %d %d\n",
 	      q->name, q->min_hres, q->min_vres, q->max_hres, q->max_vres,
 	      q->desired_hres, q->desired_vres);
   if (q->desired_hres < 0 || q->desired_vres < 0)
     {
-      while (res[i])
-	i++;
-      i--;
-      while (i >= 0)
+      for (i = resolutions->n_resolutions - 1; i >= 0; i--)
 	{
+	  const res_t *res = &(resolutions->resolutions[i]);
 	  stp_dprintf(STP_DBG_ESCP2, v, "  Checking resolution %s %d...\n",
-		      res[i]->name, i);
-	  if ((q->max_hres <= 0 || res[i]->printed_hres <= q->max_hres) &&
-	      (q->max_vres <= 0 || res[i]->printed_vres <= q->max_vres) &&
-	      q->min_hres <= res[i]->printed_hres &&
-	      q->min_vres <= res[i]->printed_vres &&
-	      verify_resolution(v, res[i]) &&
-	      verify_resolution_by_paper_type(v, res[i]))
-	    return res[i];
-	  i--;
+		      res->name, i);
+	  if ((q->max_hres <= 0 || res->printed_hres <= q->max_hres) &&
+	      (q->max_vres <= 0 || res->printed_vres <= q->max_vres) &&
+	      q->min_hres <= res->printed_hres &&
+	      q->min_vres <= res->printed_vres &&
+	      verify_resolution(v, res) &&
+	      verify_resolution_by_paper_type(v, res))
+	    return res;
 	}
     }
   if (!strict)
@@ -1849,69 +1808,65 @@ find_default_resolution(const stp_vars_t *v, const quality_t *q,
 		      desired_vres, min_y);
 	  desired_vres = min_y;
 	}
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      res[i]->printed_vres == desired_vres &&
-	      res[i]->printed_hres == desired_hres)
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      res->printed_vres == desired_vres &&
+	      res->printed_hres == desired_hres)
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
 			  "  Found desired resolution w/o oversample: %s %d: %d * %d, %d\n",
-			  res[i]->name, i, res[i]->printed_hres,
-			  res[i]->vertical_passes, res[i]->printed_vres);
-	      return res[i];
+			  res->name, i, res->printed_hres,
+			  res->vertical_passes, res->printed_vres);
+	      return res;
 	    }
-	  i++;
 	}
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      res[i]->printed_vres == desired_vres &&
-	      res[i]->printed_hres * res[i]->vertical_passes == desired_hres)
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      res->printed_vres == desired_vres &&
+	      res->printed_hres * res->vertical_passes == desired_hres)
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
 			  "  Found desired resolution: %s %d: %d * %d, %d\n",
-			  res[i]->name, i, res[i]->printed_hres,
-			  res[i]->vertical_passes, res[i]->printed_vres);
-	      return res[i];
+			  res->name, i, res->printed_hres,
+			  res->vertical_passes, res->printed_vres);
+	      return res;
 	    }
-	  i++;
 	}
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      (q->min_vres == 0 || res[i]->printed_vres >= q->min_vres) &&
-	      (q->max_vres == 0 || res[i]->printed_vres <= q->max_vres) &&
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      (q->min_vres == 0 || res->printed_vres >= q->min_vres) &&
+	      (q->max_vres == 0 || res->printed_vres <= q->max_vres) &&
 	      (q->min_hres == 0 ||
-	       res[i]->printed_hres * res[i]->vertical_passes >=q->min_hres) &&
+	       res->printed_hres * res->vertical_passes >=q->min_hres) &&
 	      (q->max_hres == 0 ||
-	       res[i]->printed_hres * res[i]->vertical_passes <= q->max_hres))
+	       res->printed_hres * res->vertical_passes <= q->max_hres))
 	    {
 	      stp_dprintf(STP_DBG_ESCP2, v,
 			  "  Found acceptable resolution: %s %d: %d * %d, %d\n",
-			  res[i]->name, i, res[i]->printed_hres,
-			  res[i]->vertical_passes, res[i]->printed_vres);
-	      return res[i];
+			  res->name, i, res->printed_hres,
+			  res->vertical_passes, res->printed_vres);
+	      return res;
 	    }
-	  i++;
 	}
     }
 #if 0
   if (!strict)			/* Try again to find a match */
     {
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]) &&
-	      res[i]->printed_vres >= desired_vres &&
-	      res[i]->printed_hres * res[i]->vertical_passes >= desired_hres &&
-	      res[i]->printed_vres <= 2 * desired_vres &&
-	      res[i]->printed_hres * res[i]->vertical_passes <= 2 * desired_hres)
-	    return res[i];
-	  i++;
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res) &&
+	      res->printed_vres >= desired_vres &&
+	      res->printed_hres * res->vertical_passes >= desired_hres &&
+	      res->printed_vres <= 2 * desired_vres &&
+	      res->printed_hres * res->vertical_passes <= 2 * desired_hres)
+	    return res;
 	}
     }
 #endif
@@ -1977,6 +1932,16 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	description->bounds.dbl.lower = float_parameters[i].min;
 	break;
       }
+  for (i = 0; i < int_parameter_count; i++)
+    if (strcmp(name, int_parameters[i].param.name) == 0)
+      {
+	stp_fill_parameter_settings(description,
+				     &(int_parameters[i].param));
+	description->deflt.integer = int_parameters[i].defval;
+	description->bounds.integer.upper = int_parameters[i].max;
+	description->bounds.integer.lower = int_parameters[i].min;
+	break;
+      }
 
   for (i = 0; i < the_parameter_count; i++)
     if (strcmp(name, the_parameters[i].name) == 0)
@@ -2004,7 +1969,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "PageSize") == 0)
     {
       int papersizes = stp_known_papersizes();
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.str = stp_string_list_create();
       if (slot && slot->is_cd)
 	{
@@ -2030,9 +1995,9 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "CDInnerRadius") == 0 )
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.str = stp_string_list_create();
-      if (printer_supports_print_to_cd(v) &&
+      if (stp_escp2_printer_supports_print_to_cd(v) &&
 	  (!slot || slot->is_cd) &&
 	  (!stp_get_string_parameter(v, "PageSize") ||
 	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") != 0))
@@ -2049,11 +2014,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "CDInnerDiameter") == 0 )
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.dimension.lower = 16 * 10 * 72 / 254;
       description->bounds.dimension.upper = 43 * 10 * 72 / 254;
       description->deflt.dimension = 43 * 10 * 72 / 254;
-      if (printer_supports_print_to_cd(v) &&
+      if (stp_escp2_printer_supports_print_to_cd(v) &&
 	  (!slot || slot->is_cd) &&
 	  (!stp_get_string_parameter(v, "PageSize") ||
 	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
@@ -2063,11 +2028,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "CDOuterDiameter") == 0 )
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.dimension.lower = 65 * 10 * 72 / 254;
       description->bounds.dimension.upper = 120 * 10 * 72 / 254;
       description->deflt.dimension = 329;
-      if (printer_supports_print_to_cd(v) &&
+      if (stp_escp2_printer_supports_print_to_cd(v) &&
 	  (!slot || slot->is_cd) &&
 	  (!stp_get_string_parameter(v, "PageSize") ||
 	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
@@ -2078,11 +2043,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "CDXAdjustment") == 0 ||
 	   strcmp(name, "CDYAdjustment") == 0)
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       description->bounds.dimension.lower = -15;
       description->bounds.dimension.upper = 15;
       description->deflt.dimension = 0;
-      if (printer_supports_print_to_cd(v) && (!slot || slot->is_cd))
+      if (stp_escp2_printer_supports_print_to_cd(v) && (!slot || slot->is_cd))
 	description->is_active = 1;
       else
 	description->is_active = 0;
@@ -2110,27 +2075,26 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "Resolution") == 0)
     {
-      const res_t *const *res = escp2_reslist(v);
+      const resolution_list_t *resolutions = escp2_reslist(v);
       description->bounds.str = stp_string_list_create();
       stp_string_list_add_string(description->bounds.str, "None",
 				 _("Default"));
       description->deflt.str = "None";
-      i = 0;
-      while (res[i])
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (verify_resolution(v, res[i]))
+	  res_t *res = &(resolutions->resolutions[i]);
+	  if (verify_resolution(v, res))
 	    stp_string_list_add_string(description->bounds.str,
-				       res[i]->name, gettext(res[i]->text));
-	  i++;
+				       res->name, gettext(res->text));
 	}
     }
   else if (strcmp(name, "InkType") == 0)
     {
-      const inklist_t *inks = escp2_inklist(v);
+      const inklist_t *inks = stp_escp2_inklist(v);
       int ninktypes = inks->n_inks;
       int verified_inktypes = 0;
       for (i = 0; i < ninktypes; i++)
-	if (verify_inktype(v, inks->inknames[i]))
+	if (verify_inktype(v, &(inks->inknames[i])))
 	  verified_inktypes++;
       description->bounds.str = stp_string_list_create();
       if (verified_inktypes > 1)
@@ -2138,10 +2102,10 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	  stp_string_list_add_string(description->bounds.str, "None",
 				     _("Standard"));
 	  for (i = 0; i < ninktypes; i++)
-	    if (verify_inktype(v, inks->inknames[i]))
+	    if (verify_inktype(v, &(inks->inknames[i])))
 	      stp_string_list_add_string(description->bounds.str,
-					 inks->inknames[i]->name,
-					 gettext(inks->inknames[i]->text));
+					 inks->inknames[i].name,
+					 gettext(inks->inknames[i].text));
 	  description->deflt.str = "None";
 	}
       else
@@ -2158,9 +2122,9 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	  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)
+					 inks->inklists[i].name,
+					 gettext(inks->inklists[i].text));
+	      if (strcmp(inks->inklists[i].name, "None") == 0)
 		has_default_choice = 1;
 	    }
 	  description->deflt.str =
@@ -2171,37 +2135,43 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "MediaType") == 0)
     {
-      const paperlist_t *p = escp2_paperlist(v);
-      int nmediatypes = p->paper_count;
-      description->bounds.str = stp_string_list_create();
-      if (nmediatypes)
+      const stp_string_list_t *p = escp2_paperlist(v);
+      description->is_active = 0;
+      if (p)
 	{
-	  for (i = 0; i < nmediatypes; i++)
-	    stp_string_list_add_string(description->bounds.str,
-				       p->papers[i].name,
-				       gettext(p->papers[i].text));
-	  description->deflt.str =
-	    stp_string_list_param(description->bounds.str, 0)->name;
+	  int nmediatypes = stp_string_list_count(p);
+	  description->bounds.str = stp_string_list_create();
+	  if (nmediatypes)
+	    {
+	      description->is_active = 1;
+	      for (i = 0; i < nmediatypes; i++)
+		stp_string_list_add_string(description->bounds.str,
+					   stp_string_list_param(p, i)->name,
+					   gettext(stp_string_list_param(p, i)->text));
+	      description->deflt.str =
+		stp_string_list_param(description->bounds.str, 0)->name;
+	    }
 	}
-      else
-	description->is_active = 0;
     }
   else if (strcmp(name, "InputSlot") == 0)
     {
-      const input_slot_list_t *slots = escp2_input_slots(v);
-      int ninputslots = slots->n_input_slots;
-      description->bounds.str = stp_string_list_create();
-      if (ninputslots)
+      const stp_string_list_t *p = escp2_slotlist(v);
+      description->is_active = 0;
+      if (p)
 	{
-	  for (i = 0; i < ninputslots; i++)
-	    stp_string_list_add_string(description->bounds.str,
-				       slots->slots[i].name,
-				       gettext(slots->slots[i].text));
-	  description->deflt.str =
-	    stp_string_list_param(description->bounds.str, 0)->name;
+	  int nslots = stp_string_list_count(p);
+	  description->bounds.str = stp_string_list_create();
+	  if (nslots)
+	    {
+	      description->is_active = 1;
+	      for (i = 0; i < nslots; i++)
+		stp_string_list_add_string(description->bounds.str,
+					   stp_string_list_param(p, i)->name,
+					   gettext(stp_string_list_param(p, i)->text));
+	      description->deflt.str =
+		stp_string_list_param(description->bounds.str, 0)->name;
+	    }
 	}
-      else
-	description->is_active = 0;
     }
   else if (strcmp(name, "PrintingDirection") == 0)
     {
@@ -2218,12 +2188,12 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "Weave") == 0)
     {
       description->bounds.str = stp_string_list_create();
-      if (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO))
+      if (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO))
 	{
-	  const res_t *res = escp2_find_resolution(v);
+	  const res_t *res = stp_escp2_find_resolution(v);
 	  const printer_weave_list_t *printer_weaves = escp2_printer_weaves(v);
 	  int nprinter_weaves = 0;
-	  if (use_printer_weave(v) && (!res || res->printer_weave))
+	  if (printer_weaves && use_printer_weave(v) && (!res || res->command))
 	    nprinter_weaves = printer_weaves->n_printer_weaves;
 	  if (nprinter_weaves)
 	    {
@@ -2263,7 +2233,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "FullBleed") == 0)
     {
-      const input_slot_t *slot = get_input_slot(v);
+      const input_slot_t *slot = stp_escp2_get_input_slot(v);
       if (slot && slot->is_cd)
 	description->is_active = 0;
       else if (supports_borderless(v))
@@ -2271,44 +2241,55 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       else
 	description->is_active = 0;
     }
-  else if (strcmp(name, "AdjustDotsize") == 0)
-    {
-      description->deflt.boolean = 0;
-    }
-  else if (strcmp(name, "CyanDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_C);
-  else if (strcmp(name, "MagentaDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_M);
-  else if (strcmp(name, "YellowDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_Y);
-  else if (strcmp(name, "BlackDensity") == 0)
-    set_density_parameter(v, description, STP_ECOLOR_K);
-  else if (strcmp(name, "RedDensity") == 0)
-    set_density_parameter(v, description, XCOLOR_R);
-  else if (strcmp(name, "BlueDensity") == 0)
-    set_density_parameter(v, description, XCOLOR_B);
-  else if (strcmp(name, "CyanHueCurve") == 0)
-    set_hue_map_parameter(v, description, STP_ECOLOR_C);
-  else if (strcmp(name, "MagentaHueCurve") == 0)
-    set_hue_map_parameter(v, description, STP_ECOLOR_M);
-  else if (strcmp(name, "YellowHueCurve") == 0)
-    set_hue_map_parameter(v, description, STP_ECOLOR_Y);
-  else if (strcmp(name, "RedHueCurve") == 0)
-    set_hue_map_parameter(v, description, XCOLOR_R);
-  else if (strcmp(name, "BlueHueCurve") == 0)
-    set_hue_map_parameter(v, description, XCOLOR_B);
+  else if (strcmp(name, "Duplex") == 0)
+    {
+      if (stp_escp2_printer_supports_duplex(v))
+	{
+	  const input_slot_t *slot = stp_escp2_get_input_slot(v);
+	  if (slot && !slot->duplex)
+	    description->is_active = 0;
+	  else
+	    {
+	      description->bounds.str = stp_string_list_create();
+	      stp_string_list_add_string
+		(description->bounds.str, "None", _("Off"));
+	      stp_string_list_add_string
+		(description->bounds.str, "DuplexNoTumble", _("Long Edge (Standard)"));
+	      stp_string_list_add_string
+		(description->bounds.str, "DuplexTumble", _("Short Edge(Flip)"));
+	      description->deflt.str = "None";
+	    }
+	}
+      else
+	description->is_active = 0;
+    }
+  else if (strcmp(name, "CyanDensity") == 0 ||
+	   strcmp(name, "MagentaDensity") == 0 ||
+	   strcmp(name, "YellowDensity") == 0 ||
+	   strcmp(name, "BlackDensity") == 0 ||
+	   strcmp(name, "RedDensity") == 0 ||
+	   strcmp(name, "BlueDensity") == 0 ||
+	   strcmp(name, "OrangeDensity") == 0)
+    set_density_parameter(v, description, name);
+  else if (strcmp(name, "CyanHueCurve") == 0 ||
+	   strcmp(name, "MagentaHueCurve") == 0 ||
+	   strcmp(name, "YellowHueCurve") == 0 ||
+	   strcmp(name, "RedHueCurve") == 0 ||
+	   strcmp(name, "BlueHueCurve") == 0 ||
+	   strcmp(name, "OrangeHueCurve") == 0)
+    set_hue_map_parameter(v, description, name);
   else if (strcmp(name, "UseGloss") == 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name && ink_name->channel_set->aux_channel_count > 0)
+      const inkname_t *ink_name = get_inktype(v);
+      if (ink_name && ink_name->aux_channel_count > 0)
 	description->is_active = 1;
       else
 	description->is_active = 0;
     }
   else if (strcmp(name, "GlossLimit") == 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
-      if (ink_name && ink_name->channel_set->aux_channel_count > 0)
+      const inkname_t *ink_name = get_inktype(v);
+      if (ink_name && ink_name->aux_channel_count > 0)
 	description->is_active = 1;
       else
 	description->is_active = 0;
@@ -2317,16 +2298,12 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	   strcmp(name, "DropSize2") == 0 ||
 	   strcmp(name, "DropSize3") == 0)
     {
-      if (escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES))
+      if (stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES))
 	{
-	  int resid = compute_resid(escp2_find_resolution(v));
-	  const escp2_dropsize_t *drops = escp2_dropsizes(v, resid);
-	  if (strcmp(name, "DropSize1") == 0 && drops->numdropsizes >= 1)
-	    description->deflt.dbl = drops->dropsizes[0];
-	  else if (strcmp(name, "DropSize2") == 0 && drops->numdropsizes >= 2)
-	    description->deflt.dbl = drops->dropsizes[1];
-	  else if (strcmp(name, "DropSize3") == 0 && drops->numdropsizes >= 3)
-	    description->deflt.dbl = drops->dropsizes[2];
+	  const res_t *res = stp_escp2_find_resolution(v);
+	  if (res && res->v &&
+	      stp_check_float_parameter(v, name, STP_PARAMETER_ACTIVE))
+	    description->deflt.dbl = stp_get_float_parameter(v, name);
 	  description->is_active = 1;
 	}
       else
@@ -2336,20 +2313,15 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	   strcmp(name, "GCRLower") == 0 ||
 	   strcmp(name, "GCRUpper") == 0)
     {
-      const paper_adjustment_t *paper_adj = get_media_adjustment(v);
+      const stp_vars_t *paper_adj = get_media_adjustment(v);
       if (paper_adj &&
 	  stp_get_string_parameter(v, "PrintingMode") &&
 	  strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
 	{
-	  if (paper_adj)
-	    {
-	      if (strcmp(name, "BlackTrans") == 0)
-		description->deflt.dbl = paper_adj->k_transition;
-	      else if (strcmp(name, "GCRUpper") == 0)
-		description->deflt.dbl = paper_adj->k_upper;
-	      else if (strcmp(name, "GCRLower") == 0)
-		description->deflt.dbl = paper_adj->k_lower;
-	    }
+	  if (paper_adj && stp_check_float_parameter(paper_adj, name, STP_PARAMETER_ACTIVE))
+	    description->deflt.dbl = stp_get_float_parameter(paper_adj, name);
+	  else
+	    description->p_type = STP_PARAMETER_TYPE_INVALID;
 	}
       else
 	description->p_type = STP_PARAMETER_TYPE_INVALID;
@@ -2369,20 +2341,20 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     set_color_value_parameter(v, description, STP_ECOLOR_M);
   else if (strcmp(name, "DarkYellowValue") == 0)
     set_color_value_parameter(v, description, STP_ECOLOR_Y);
-  else if (strcmp(name, "GrayTransition") == 0)
+  else if (strcmp(name, "GrayTrans") == 0)
     set_gray_transition_parameter(v, description, 2);
-  else if (strcmp(name, "DarkGrayTransition") == 0 ||
-	   strcmp(name, "LightGrayTransition") == 0)
+  else if (strcmp(name, "DarkGrayTrans") == 0 ||
+	   strcmp(name, "LightGrayTrans") == 0)
     set_gray_transition_parameter(v, description, 3);
-  else if (strcmp(name, "Gray1Transition") == 0 ||
-	   strcmp(name, "Gray2Transition") == 0 ||
-	   strcmp(name, "Gray3Transition") == 0)
+  else if (strcmp(name, "Gray1Trans") == 0 ||
+	   strcmp(name, "Gray2Trans") == 0 ||
+	   strcmp(name, "Gray3Trans") == 0)
     set_gray_transition_parameter(v, description, 4);
-  else if (strcmp(name, "LightCyanTransition") == 0)
+  else if (strcmp(name, "LightCyanTrans") == 0)
     set_color_transition_parameter(v, description, STP_ECOLOR_C);
-  else if (strcmp(name, "LightMagentaTransition") == 0)
+  else if (strcmp(name, "LightMagentaTrans") == 0)
     set_color_transition_parameter(v, description, STP_ECOLOR_M);
-  else if (strcmp(name, "DarkYellowTransition") == 0)
+  else if (strcmp(name, "DarkYellowTrans") == 0)
     set_color_transition_parameter(v, description, STP_ECOLOR_Y);
   else if (strcmp(name, "GrayScale") == 0)
     set_gray_scale_parameter(v, description, 2);
@@ -2410,7 +2382,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "SupportsInkChange") == 0)
     {
       description->deflt.integer =
-	escp2_has_cap(v, MODEL_SUPPORTS_INK_CHANGE,
+	stp_escp2_has_cap(v, MODEL_SUPPORTS_INK_CHANGE,
 		      MODEL_SUPPORTS_INK_CHANGE_YES);
     }
   else if (strcmp(name, "AlternateAlignmentPasses") == 0)
@@ -2427,27 +2399,24 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "ChannelNames") == 0)
     {
-      const channel_name_t *channel_names = escp2_channel_names(v);
-      description->bounds.str = stp_string_list_create();
-      for (i = 0; i < channel_names->count; i++)
-	stp_string_list_add_string
-	  (description->bounds.str,
-	   channel_names->names[i], gettext(channel_names->names[i]));
-      description->deflt.str =
-	stp_string_list_param(description->bounds.str, 0)->name;
+      const stp_string_list_t *channel_names = escp2_channel_names(v);
+      if (channel_names)
+	{
+	  description->bounds.str = stp_string_list_create_copy(channel_names);
+	  description->deflt.str =
+	    stp_string_list_param(description->bounds.str, 0)->name;
+	}
     }
   else if (strcmp(name, "SupportsPacketMode") == 0)
     {
       description->deflt.boolean =
-	escp2_has_cap(v, MODEL_PACKET_MODE, MODEL_PACKET_MODE_YES);
+	stp_escp2_has_cap(v, MODEL_PACKET_MODE, MODEL_PACKET_MODE_YES);
     }
   else if (strcmp(name, "PrintingMode") == 0)
     {
-      const escp2_inkname_t *ink_name = get_inktype(v);
       description->bounds.str = stp_string_list_create();
-      if (!ink_name || ink_name->inkset != INKSET_QUADTONE)
-	stp_string_list_add_string
-	  (description->bounds.str, "Color", _("Color"));
+      stp_string_list_add_string
+	(description->bounds.str, "Color", _("Color"));
       stp_string_list_add_string
 	(description->bounds.str, "BW", _("Black and White"));
       description->deflt.str =
@@ -2455,18 +2424,18 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "RawChannels") == 0)
     {
-      const inklist_t *inks = escp2_inklist(v);
+      const inklist_t *inks = stp_escp2_inklist(v);
       int ninktypes = inks->n_inks;
       description->bounds.str = stp_string_list_create();
       if (ninktypes > 1)
 	{
 	  stp_string_list_add_string(description->bounds.str, "None", "None");
 	  for (i = 0; i < ninktypes; i++)
-	    if (inks->inknames[i]->inkset == INKSET_EXTENDED)
+	    if (inks->inknames[i].inkset == INKSET_EXTENDED)
 	      {
 		const channel_count_t *ch =
 		  (get_channel_count_by_number
-		   (inks->inknames[i]->channel_set->channel_count));
+		   (inks->inknames[i].channel_count));
 		stp_string_list_add_string(description->bounds.str,
 					   ch->name, ch->name);
 	      }
@@ -2482,28 +2451,44 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       if (stp_get_string_parameter(v, "PrintingMode") &&
 	  strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
 	{
-	  const escp2_inkname_t *ink_name = get_inktype(v);
-	  if (ink_name && ink_name->inkset == INKSET_CMYKRB)
+	  const inkname_t *ink_name = get_inktype(v);
+	  if (ink_name && ink_name->inkset == INKSET_OTHER)
 	    description->is_active = 1;
 	}
     }
+  else if (strcmp(name, "PageDryTime") == 0 ||
+	   strcmp(name, "ScanDryTime") == 0 ||
+	   strcmp(name, "ScanMinDryTime") == 0 ||
+	   strcmp(name, "FeedAdjustment") == 0 ||
+	   strcmp(name, "PaperThickness") == 0 ||
+	   strcmp(name, "VacuumIntensity") == 0 ||
+	   strcmp(name, "FeedSequence") == 0 ||
+	   strcmp(name, "PrintMethod") == 0 ||
+	   strcmp(name, "PaperMedia") == 0 ||
+	   strcmp(name, "PaperMediaSize") == 0 ||
+	   strcmp(name, "PlatenGap") == 0)
+    {
+      description->is_active = 0;
+      if (stp_escp2_has_media_feature(v, name))
+	description->is_active = 1;
+    }
 }
 
-static const res_t *
-escp2_find_resolution(const stp_vars_t *v)
+const res_t *
+stp_escp2_find_resolution(const stp_vars_t *v)
 {
   const char *resolution = stp_get_string_parameter(v, "Resolution");
   if (resolution)
     {
-      const res_t *const *res = escp2_reslist(v);
-      int i = 0;
-      while (res[i])
+      const resolution_list_t *resolutions = escp2_reslist(v);
+      int i;
+      for (i = 0; i < resolutions->n_resolutions; i++)
 	{
-	  if (!strcmp(resolution, res[i]->name))
-	    return res[i];
-	  else if (!strcmp(res[i]->name, ""))
+	  const res_t *res = &(resolutions->resolutions[i]);
+	  if (!strcmp(resolution, res->name))
+	    return res;
+	  else if (!strcmp(res->name, ""))
 	    return NULL;
-	  i++;
 	}
     }
   if (stp_check_string_parameter(v, "Quality", STP_PARAMETER_ACTIVE))
@@ -2536,6 +2521,71 @@ imax(int a, int b)
 }
 
 static void
+escp2_media_size(const stp_vars_t *v,	/* I */
+		 int  *width,		/* O - Width in points */
+		 int  *height) 		/* O - Height in points */
+{
+  if (stp_get_page_width(v) > 0 && stp_get_page_height(v) > 0)
+    {
+      *width = stp_get_page_width(v);
+      *height = stp_get_page_height(v);
+    }
+  else
+    {
+      const char *page_size = stp_get_string_parameter(v, "PageSize");
+      const stp_papersize_t *papersize = NULL;
+      if (page_size)
+	papersize = stp_get_papersize_by_name(page_size);
+      if (!papersize)
+	{
+	  *width = 1;
+	  *height = 1;
+	}
+      else
+	{
+	  *width = papersize->width;
+	  *height = papersize->height;
+	}
+      if (*width == 0 || *height == 0)
+	{
+	  const input_slot_t *slot = stp_escp2_get_input_slot(v);
+	  if (slot && slot->is_cd)
+	    {
+	      papersize = stp_get_papersize_by_name("CDCustom");
+	      if (papersize)
+		{
+		  if (*width == 0)
+		    *width = papersize->width;
+		  if (*height == 0)
+		    *height = papersize->height;
+		}
+	    }
+	  else
+	    {
+	      int papersizes = stp_known_papersizes();
+	      int i;
+	      for (i = 0; i < papersizes; i++)
+		{
+		  papersize = stp_get_papersize_by_index(i);
+		  if (verify_papersize(v, papersize))
+		    {
+		      if (*width == 0)
+			*width = papersize->width;
+		      if (*height == 0)
+			*height = papersize->height;
+		      break;
+		    }
+		}
+	    }
+	}
+      if (*width == 0)
+	*width = 612;
+      if (*height == 0)
+	*height = 792;
+    }
+}
+
+static void
 internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
 			int use_maximum_area,
 			int *left, int *right, int *bottom, int *top)
@@ -2554,14 +2604,14 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
   if (media_size)
     pt = stp_get_papersize_by_name(media_size);
 
-  input_slot = get_input_slot(v);
+  input_slot = stp_escp2_get_input_slot(v);
   if (input_slot)
     {
       cd = input_slot->is_cd;
       rollfeed = input_slot->is_roll_feed;
     }
 
-  stp_default_media_size(v, &width, &height);
+  escp2_media_size(v, &width, &height);
   if (cd)
     {
       if (pt)
@@ -2675,7 +2725,7 @@ escp2_limit(const stp_vars_t *v,			/* I */
 static void
 escp2_describe_resolution(const stp_vars_t *v, int *x, int *y)
 {
-  const res_t *res = escp2_find_resolution(v);
+  const res_t *res = stp_escp2_find_resolution(v);
   if (res && verify_resolution(v, res))
     {
       *x = res->printed_hres;
@@ -2697,20 +2747,20 @@ escp2_describe_output(const stp_vars_t *v)
     return "Grayscale";
   else
     {
-      const escp2_inkname_t *ink_type = get_inktype(v);
+      const inkname_t *ink_type = get_inktype(v);
       if (ink_type)
 	{
 	  switch (ink_type->inkset)
 	    {
 	    case INKSET_QUADTONE:
 	      return "Grayscale";
-	    case INKSET_CMYKRB:
+	    case INKSET_OTHER:
 	    case INKSET_CMYK:
 	    case INKSET_CcMmYK:
 	    case INKSET_CcMmYyK:
 	    case INKSET_CcMmYKk:
 	    default:
-	      if (ink_type->channel_set->channels[0])
+	      if (ink_type->channels[0].n_subchannels > 0)
 		return "KCMY";
 	      else
 		return "CMY";
@@ -2725,23 +2775,23 @@ escp2_describe_output(const stp_vars_t *v)
 static int
 escp2_has_advanced_command_set(const stp_vars_t *v)
 {
-  return (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
-	  escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) ||
-	  escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_2000));
+  return (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
+	  stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) ||
+	  stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_2000));
 }
 
 static int
 escp2_use_extended_commands(const stp_vars_t *v, int use_softweave)
 {
-  return (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
-	  (escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES) &&
+  return (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_PRO) ||
+	  (stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES) &&
 	   use_softweave));
 }
 
 static int
 set_raw_ink_type(stp_vars_t *v)
 {
-  const inklist_t *inks = escp2_inklist(v);
+  const inklist_t *inks = stp_escp2_inklist(v);
   int ninktypes = inks->n_inks;
   int i;
   const char *channel_name = stp_get_string_parameter(v, "RawChannels");
@@ -2756,14 +2806,14 @@ set_raw_ink_type(stp_vars_t *v)
    * If we're using raw printer output, we dummy up the appropriate inkset.
    */
   for (i = 0; i < ninktypes; i++)
-    if (inks->inknames[i]->inkset == INKSET_EXTENDED &&
-	(inks->inknames[i]->channel_set->channel_count == count->count))
+    if (inks->inknames[i].inkset == INKSET_EXTENDED &&
+	(inks->inknames[i].channel_count == count->count))
       {
 	stp_dprintf(STP_DBG_INK, v, "Changing ink type from %s to %s\n",
 		    stp_get_string_parameter(v, "InkType") ?
 		    stp_get_string_parameter(v, "InkType") : "NULL",
-		    inks->inknames[i]->name);
-	stp_set_string_parameter(v, "InkType", inks->inknames[i]->name);
+		    inks->inknames[i].name);
+	stp_set_string_parameter(v, "InkType", inks->inknames[i].name);
 	stp_set_int_parameter(v, "STPIRawChannels", count->count);
 	return 1;
       }
@@ -2774,110 +2824,32 @@ set_raw_ink_type(stp_vars_t *v)
 }
 
 static void
-adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
+adjust_density_and_ink_type(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const paper_adjustment_t *pt = pd->paper_adjustment;
+  const stp_vars_t *pv = pd->paper_type->v;
   double paper_density = .8;
-  int o_resid = compute_virtual_resid(pd->res);
-  int n_resid = compute_printed_resid(pd->res);
-  double virtual_scale = 1;
 
-  if (pt)
-    paper_density = pt->base_density;
+  if (pv && stp_check_float_parameter(pv, "Density", STP_PARAMETER_ACTIVE))
+    paper_density = stp_get_float_parameter(pv, "Density");
 
   if (!stp_check_float_parameter(v, "Density", STP_PARAMETER_DEFAULTED))
     {
       stp_set_float_parameter_active(v, "Density", STP_PARAMETER_ACTIVE);
       stp_set_float_parameter(v, "Density", 1.0);
     }
+  stp_scale_float_parameter(v, "Density", paper_density * escp2_density(v));
+  pd->drop_size = escp2_ink_type(v);
 
-  while (n_resid > o_resid)
-    {
-      virtual_scale /= 2.0;
-      n_resid--;
-    }
-  while (n_resid < o_resid)
-    {
-      virtual_scale *= 2.0;
-      n_resid++;
-    }
-  stp_scale_float_parameter
-    (v, "Density", virtual_scale * paper_density * escp2_density(v, o_resid));
-  pd->drop_size = escp2_ink_type(v, o_resid);
-  pd->ink_resid = o_resid;
-
-  /*
-   * If density is greater than 1, try to find the dot size from a lower
-   * resolution that will let us print.  This allows use of high ink levels
-   * on special paper types that need a lot of ink.
-   */
   if (stp_get_float_parameter(v, "Density") > 1.0)
-    {
-      if (stp_check_int_parameter(v, "escp2_ink_type", STP_PARAMETER_ACTIVE) ||
-	  stp_check_int_parameter(v, "escp2_density", STP_PARAMETER_ACTIVE) ||
-	  stp_check_int_parameter(v, "escp2_bits", STP_PARAMETER_ACTIVE) ||
-	  virtual_scale != 1.0 ||
-	  (stp_check_boolean_parameter(v, "AdjustDotsize",
-				       STP_PARAMETER_ACTIVE) &&
-	   ! stp_get_boolean_parameter(v, "AdjustDotsize")))
-	{
-	  stp_set_float_parameter(v, "Density", 1.0);
-	}
-      else
-	{
-	  double density = stp_get_float_parameter(v, "Density");
-	  int resid = o_resid;
-	  int xresid = resid;
-	  double xdensity = density;
-	  while (density > 1.0 && resid >= RES_360)
-	    {
-	      int tresid = xresid - 1;
-	      int base_res_now = escp2_base_res(v, resid);
-	      int bits_now = escp2_bits(v, resid);
-	      double density_now = escp2_density(v, resid);
-	      int base_res_then = escp2_base_res(v, tresid);
-	      int bits_then = escp2_bits(v, tresid);
-	      double density_then = escp2_density(v, tresid);
-	      int drop_size_then = escp2_ink_type(v, tresid);
-
-	      /*
-	       * If we would change the number of bits in the ink type,
-	       * don't try this.  Some resolutions require using a certain
-	       * number of bits!
-	       */
-
-	      if (bits_now != bits_then || density_then <= 0.0 ||
-		  base_res_now != base_res_then || drop_size_then == -1)
-		break;
-	      xdensity = density * density_then / density_now / 2;
-	      xresid = tresid;
-
-	      /*
-	       * If we wouldn't get a significant improvement by changing the
-	       * resolution, don't waste the effort trying.
-	       */
-	      if (density / xdensity > 1.001)
-		{
-		  density = xdensity;
-		  resid = tresid;
-		}
-	    }
-	  pd->drop_size = escp2_ink_type(v, resid);
-	  pd->ink_resid = resid;
-	  if (density > 1.0)
-	    density = 1.0;
-	  stp_set_float_parameter(v, "Density", density);
-	}
-    }
+    stp_set_float_parameter(v, "Density", 1.0);
 }
 
 static void
-adjust_print_quality(stp_vars_t *v, stp_image_t *image)
+adjust_print_quality(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  stp_curve_t *adjustment = NULL;
-  const paper_adjustment_t *pt;
+  const stp_vars_t *pv = pd->paper_type->v;
   double k_upper = 1.0;
   double k_lower = 0;
   double k_transition = 1.0;
@@ -2887,24 +2859,143 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
    * sometimes change.
    */
 
-  pt = pd->paper_adjustment;
-  if (pt)
+  if (pv)
     {
-      k_lower = pt->k_lower;
-      k_upper = pt->k_upper;
-      k_transition = pt->k_transition;
-      if (!stp_check_float_parameter(v, "CyanBalance", STP_PARAMETER_ACTIVE))
-	stp_set_float_parameter(v, "CyanBalance", pt->cyan);
-      if (!stp_check_float_parameter(v, "MagentaBalance", STP_PARAMETER_ACTIVE))
-	stp_set_float_parameter(v, "MagentaBalance", pt->magenta);
-      if (!stp_check_float_parameter(v, "YellowBalance", STP_PARAMETER_ACTIVE))
-	stp_set_float_parameter(v, "YellowBalance", pt->yellow);
+      int i;
+      stp_string_list_t *slist;
       stp_set_default_float_parameter(v, "BlackDensity", 1.0);
-      stp_scale_float_parameter(v, "BlackDensity", pt->black);
       stp_set_default_float_parameter(v, "Saturation", 1.0);
-      stp_scale_float_parameter(v, "Saturation", pt->saturation);
       stp_set_default_float_parameter(v, "Gamma", 1.0);
-      stp_scale_float_parameter(v, "Gamma", pt->gamma);
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_STRING_LIST);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_string_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_string_parameter(v, name,
+					 stp_get_string_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_FILE);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_file_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_file_parameter(v, name,
+				       stp_get_file_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_INT);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_int_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_int_parameter(v, name,
+				      stp_get_int_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_DIMENSION);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_dimension_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_dimension_parameter(v, name,
+					    stp_get_dimension_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_BOOLEAN);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_boolean_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_boolean_parameter(v, name,
+					  stp_get_boolean_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_CURVE);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_curve_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_curve_parameter(v, name,
+					stp_get_curve_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_ARRAY);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_array_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_array_parameter(v, name,
+					stp_get_array_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_RAW);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (!stp_check_raw_parameter(v, name, STP_PARAMETER_ACTIVE))
+		{
+		  const stp_raw_t *r = stp_get_raw_parameter(pv, name);
+		  stp_set_raw_parameter(v, name, r->data, r->bytes);
+		}
+	    }
+	  stp_string_list_destroy(slist);
+	}
+      slist = stp_list_parameters(pv, STP_PARAMETER_TYPE_DOUBLE);
+      if (slist)
+	{
+	  int len = stp_string_list_count(slist);
+	  for (i = 0; i < len; i++)
+	    {
+	      const char *name = stp_string_list_param(slist, i)->name;
+	      if (strcmp(name, "BlackDensity") == 0 ||
+		  strcmp(name, "Saturation") == 0 ||
+		  strcmp(name, "Gamma") == 0)
+		stp_scale_float_parameter(v, name,
+					  stp_get_float_parameter(pv, name));
+	      else if (strcmp(name, "GCRLower") == 0)
+		k_lower = stp_get_float_parameter(pv, "GCRLower");
+	      else if (strcmp(name, "GCRUpper") == 0)
+		k_upper = stp_get_float_parameter(pv, "GCRUpper");
+	      else if (strcmp(name, "BlackTrans") == 0)
+		k_transition = stp_get_float_parameter(pv, "BlackTrans");
+	      else if (!stp_check_float_parameter(v, name, STP_PARAMETER_ACTIVE))
+		stp_set_float_parameter(v, name,
+					stp_get_float_parameter(pv, name));
+	    }
+	  stp_string_list_destroy(slist);
+	}
     }
 
   if (!stp_check_float_parameter(v, "GCRLower", STP_PARAMETER_ACTIVE))
@@ -2915,63 +3006,39 @@ adjust_print_quality(stp_vars_t *v, stp_image_t *image)
     stp_set_default_float_parameter(v, "BlackTrans", k_transition);
 
 
-  if (!stp_check_curve_parameter(v, "HueMap", STP_PARAMETER_ACTIVE) &&
-      pt && pt->hue_adjustment)
-    {
-      adjustment = stp_curve_create_from_string(pt->hue_adjustment);
-      stp_set_curve_parameter(v, "HueMap", adjustment);
-      stp_set_curve_parameter_active(v, "HueMap", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
-  if (!stp_check_curve_parameter(v, "SatMap", STP_PARAMETER_ACTIVE) &&
-      pt && pt->sat_adjustment)
-    {
-      adjustment = stp_curve_create_from_string(pt->sat_adjustment);
-      stp_set_curve_parameter(v, "SatMap", adjustment);
-      stp_set_curve_parameter_active(v, "SatMap", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
-  if (!stp_check_curve_parameter(v, "LumMap", STP_PARAMETER_ACTIVE) &&
-      pt && pt->lum_adjustment)
-    {
-      adjustment = stp_curve_create_from_string(pt->lum_adjustment);
-      stp_set_curve_parameter(v, "LumMap", adjustment);
-      stp_set_curve_parameter_active(v, "LumMap", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
 }
 
 static int
-count_channels(const escp2_inkname_t *inks, int use_aux_channels)
+count_channels(const inkname_t *inks, int use_aux_channels)
 {
   int answer = 0;
   int i;
-  for (i = 0; i < inks->channel_set->channel_count; i++)
-    if (inks->channel_set->channels[i])
-      answer += inks->channel_set->channels[i]->n_subchannels;
+  for (i = 0; i < inks->channel_count; i++)
+    if (inks->channels[i].n_subchannels > 0)
+      answer += inks->channels[i].n_subchannels;
   if (use_aux_channels)
-    for (i = 0; i < inks->channel_set->aux_channel_count; i++)
-      if (inks->channel_set->aux_channels[i])
-	answer += inks->channel_set->aux_channels[i]->n_subchannels;
+    for (i = 0; i < inks->aux_channel_count; i++)
+      if (inks->aux_channels[i].n_subchannels > 0)
+	answer += inks->aux_channels[i].n_subchannels;
   return answer;
 }
 
 static int
-compute_channel_count(const escp2_inkname_t *ink_type, int channel_limit,
+compute_channel_count(const inkname_t *ink_type, int channel_limit,
 		      int use_aux_channels)
 {
   int i;
   int physical_channels = 0;
   for (i = 0; i < channel_limit; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel)
 	physical_channels += channel->n_subchannels;
     }
   if (use_aux_channels)
-    for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
-      if (ink_type->channel_set->aux_channels[i])
-	physical_channels += ink_type->channel_set->aux_channels[i]->n_subchannels;
+    for (i = 0; i < ink_type->aux_channel_count; i++)
+      if (ink_type->aux_channels[i].n_subchannels > 0)
+	physical_channels += ink_type->aux_channels[i].n_subchannels;
   return physical_channels;
 }
 
@@ -2990,12 +3057,12 @@ setup_inks(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   int i, j;
   escp2_dropsize_t *drops;
-  const escp2_inkname_t *ink_type = pd->inkname;
-  const paper_adjustment_t *paper = pd->paper_adjustment;
+  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, pd->ink_resid);
+  drops = escp2_copy_dropsizes(v);
   stp_init_debug_messages(v);
   if (stp_check_float_parameter(v, "DropSize1", STP_PARAMETER_ACTIVE))
     {
@@ -3023,7 +3090,7 @@ setup_inks(stp_vars_t *v)
     }
   for (i = 0; i < pd->logical_channels; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel && channel->n_subchannels > 0)
 	{
 	  int hue_curve_found = 0;
@@ -3032,7 +3099,7 @@ setup_inks(stp_vars_t *v)
 	  double userval = get_double_param(v, param);
 	  if (shades->n_shades < channel->n_subchannels)
 	    {
-	      stp_erprintf("Not enough shades!\n");
+	      stp_erprintf("Not enough shades\n");
 	    }
 	  if (ink_type->inkset != INKSET_EXTENDED)
 	    {
@@ -3068,45 +3135,31 @@ setup_inks(stp_vars_t *v)
 		  stp_check_float_parameter(v, subparam, STP_PARAMETER_ACTIVE))
 		stp_channel_set_cutoff_adjustment
 		  (v, i, j, stp_get_float_parameter(v, subparam));
-	      else if (paper)
-		stp_channel_set_cutoff_adjustment(v, i, j,
-						  paper->subchannel_cutoff);
+	      else if (pv)
+		{
+		  if (subparam &&
+		      stp_check_float_parameter(pv, subparam, STP_PARAMETER_ACTIVE))
+		    stp_channel_set_cutoff_adjustment
+		      (v, i, j, stp_get_float_parameter(pv, subparam));
+		  else if (stp_check_float_parameter(pv, "SubchannelCutoff", STP_PARAMETER_ACTIVE))
+		    stp_channel_set_cutoff_adjustment
+		      (v, i, j, stp_get_float_parameter(pv, "SubchannelCutoff"));
+		}
 	    }
 	  if (ink_type->inkset != INKSET_EXTENDED)
 	    {
-	      if (channel->hue_curve && channel->hue_curve->curve_name)
+	      if (channel->hue_curve_name)
 		{
-		  char *hue_curve_name;
 		  const stp_curve_t *curve = NULL;
-		  stp_asprintf(&hue_curve_name, "%sHueCurve",
-			       channel->hue_curve->curve_name);
-		  curve = stp_get_curve_parameter(v, hue_curve_name);
+		  curve = stp_get_curve_parameter(v, channel->hue_curve_name);
 		  if (curve)
 		    {
 		      stp_channel_set_curve(v, i, curve);
 		      hue_curve_found = 1;
 		    }
-		  stp_free(hue_curve_name);
 		}
 	      if (channel->hue_curve && !hue_curve_found)
-		{
-		  if (!channel->hue_curve->curve_impl)
-		    channel->hue_curve->curve_impl =
-		      stp_curve_create_from_string(channel->hue_curve->curve);
-		  if (channel->hue_curve->curve_impl)
-		    {
-		      stp_curve_t *curve_tmp =
-			stp_curve_create_copy(channel->hue_curve->curve_impl);
-#if 0
-		      (void) stp_curve_rescale(curve_tmp,
-					       sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
-					       STP_CURVE_COMPOSE_EXPONENTIATE,
-					       STP_CURVE_BOUNDS_RESCALE);
-#endif
-		      stp_channel_set_curve(v, i, curve_tmp);
-		      stp_curve_destroy(curve_tmp);
-		    }
-		}
+		stp_channel_set_curve(v, i, channel->hue_curve);
 	    }
 	  escp2_free_shades(shades);
 	}
@@ -3114,10 +3167,9 @@ setup_inks(stp_vars_t *v)
   if (pd->use_aux_channels)
     {
       int base_count = pd->logical_channels;
-      for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
+      for (i = 0; i < ink_type->aux_channel_count; i++)
 	{
-	  const ink_channel_t *channel =
-	    ink_type->channel_set->aux_channels[i];
+	  const ink_channel_t *channel = &(ink_type->aux_channels[i]);
 	  if (channel && channel->n_subchannels > 0)
 	    {
 	      int ch = i + base_count;
@@ -3158,14 +3210,21 @@ setup_inks(stp_vars_t *v)
 		      stp_check_float_parameter(v, subparam, STP_PARAMETER_ACTIVE))
 		    stp_channel_set_cutoff_adjustment
 		      (v, ch, j, stp_get_float_parameter(v, subparam));
-		  else if (paper)
-		    stp_channel_set_cutoff_adjustment(v, ch, j,
-						      paper->subchannel_cutoff);
+		  else if (pv)
+		    {
+		      if (subparam &&
+			  stp_check_float_parameter(pv, subparam, STP_PARAMETER_ACTIVE))
+			stp_channel_set_cutoff_adjustment
+			  (v, ch, j, stp_get_float_parameter(pv, subparam));
+		      else if (stp_check_float_parameter(pv, "SubchannelCutoff", STP_PARAMETER_ACTIVE))
+			stp_channel_set_cutoff_adjustment
+			  (v, ch, j, stp_get_float_parameter(pv, "SubchannelCutoff"));
+		    }
 		}
 	      if (channel->hue_curve)
 		{
 		  stp_curve_t *curve_tmp =
-		    stp_curve_create_copy(channel->hue_curve->curve_impl);
+		    stp_curve_create_copy(channel->hue_curve);
 		  (void) stp_curve_rescale(curve_tmp,
 					   sqrt(1.0 / stp_get_float_parameter(v, "Gamma")),
 					   STP_CURVE_COMPOSE_EXPONENTIATE,
@@ -3188,13 +3247,13 @@ setup_head_offset(stp_vars_t *v)
   int i;
   int channel_id = 0;
   int channel_limit = pd->logical_channels;
-  const escp2_inkname_t *ink_type = pd->inkname;
+  const inkname_t *ink_type = pd->inkname;
   if (pd->channels_in_use > pd->logical_channels)
     channel_limit = pd->channels_in_use;
   pd->head_offset = stp_zalloc(sizeof(int) * channel_limit);
   for (i = 0; i < pd->logical_channels; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel)
 	{
 	  int j;
@@ -3208,9 +3267,9 @@ setup_head_offset(stp_vars_t *v)
     }
   if (pd->use_aux_channels)
     {
-      for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
+      for (i = 0; i < ink_type->aux_channel_count; i++)
 	{
-	  const ink_channel_t *channel = ink_type->channel_set->aux_channels[i];
+	  const ink_channel_t *channel = &(ink_type->aux_channels[i]);
 	  if (channel)
 	    {
 	      int j;
@@ -3236,6 +3295,36 @@ setup_head_offset(stp_vars_t *v)
       }
 }
 
+static int
+supports_split_channels(stp_vars_t *v)
+{
+  escp2_privdata_t *pd = get_privdata(v);
+  int i;
+  int split_channel_count = -1;
+  for (i = 0; i < pd->logical_channels; i++)
+    {
+      int j;
+      if (pd->inkname->channels[i].n_subchannels > 0)
+	{
+	  for (j = 0; j < pd->inkname->channels[i].n_subchannels; j++)
+	    {
+	      int split_count = pd->inkname->channels[i].subchannels[j].split_channel_count;
+	      if (split_count == 0)
+		return 0;
+	      else if (split_channel_count >= 0 && split_count != split_channel_count)
+		return 0;
+	      else
+		split_channel_count = split_count;
+	    }
+	}
+    }
+  if (split_channel_count > 0)
+    return split_channel_count;
+  else
+    return 0;
+}
+
+
 static void
 setup_split_channels(stp_vars_t *v)
 {
@@ -3243,18 +3332,13 @@ setup_split_channels(stp_vars_t *v)
   /*
    * Set up the output channels
    */
-  if (pd->physical_channels == 1 &&
-      
-      pd->inkname->channel_set->channels[0]->subchannels->split_channel_count > 1)
+  pd->split_channel_count = supports_split_channels(v);
+  if (pd->split_channel_count)
     {
-      int i;
-      int incr = 1;
-      pd->split_channel_count =
-	pd->inkname->channel_set->channels[0]->subchannels->split_channel_count;
       if (pd->res->vres <
 	  (escp2_base_separation(v) / escp2_black_nozzle_separation(v)))
 	{
-	  incr =
+	  int incr =
 	    (escp2_base_separation(v) / escp2_black_nozzle_separation(v)) /
 	    pd->res->vres;
 	  pd->split_channel_count /= incr;
@@ -3262,13 +3346,7 @@ setup_split_channels(stp_vars_t *v)
 	  pd->nozzles /= incr;
 	  pd->min_nozzles /= incr;
 	}
-      pd->split_channels = stp_malloc(pd->split_channel_count * sizeof(short));
-      for (i = 0; i < pd->split_channel_count; i++)
-	pd->split_channels[i] =
-	  pd->inkname->channel_set->channels[0]->subchannels->split_channels[i * incr];
     }
-  else
-    pd->split_channel_count = 0;
 }
 
 static void
@@ -3276,12 +3354,12 @@ setup_basic(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   pd->advanced_command_set = escp2_has_advanced_command_set(v);
-  pd->command_set = escp2_get_cap(v, MODEL_COMMAND);
-  pd->variable_dots = escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES);
-  pd->has_vacuum = escp2_has_cap(v, MODEL_VACUUM, MODEL_VACUUM_YES);
-  pd->has_graymode = escp2_has_cap(v, MODEL_GRAYMODE, MODEL_GRAYMODE_YES);
-  pd->init_sequence = escp2_preinit_sequence(v);
-  pd->deinit_sequence = escp2_postinit_remote_sequence(v);
+  pd->command_set = stp_escp2_get_cap(v, MODEL_COMMAND);
+  pd->variable_dots = stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES);
+  pd->has_graymode = stp_escp2_has_cap(v, MODEL_GRAYMODE, MODEL_GRAYMODE_YES);
+  pd->preinit_sequence = escp2_preinit_sequence(v);
+  pd->preinit_remote_sequence = escp2_preinit_remote_sequence(v);
+  pd->deinit_remote_sequence = escp2_postinit_remote_sequence(v);
   pd->borderless_sequence = escp2_vertical_borderless_sequence(v);
   pd->base_separation = escp2_base_separation(v);
   pd->resolution_scale = escp2_resolution_scale(v);
@@ -3291,51 +3369,93 @@ static void
 setup_misc(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  pd->input_slot = get_input_slot(v);
-  pd->paper_type = get_media_type(v);
-  pd->paper_adjustment = get_media_adjustment(v);
+  pd->input_slot = stp_escp2_get_input_slot(v);
+  pd->paper_type = stp_escp2_get_media_type(v, 0);
   pd->ink_group = escp2_inkgroup(v);
+  pd->media_settings = stp_vars_create_copy(pd->paper_type->v);
+  stp_escp2_set_media_size(pd->media_settings, v);
+  if (stp_check_float_parameter(v, "PageDryTime", STP_PARAMETER_ACTIVE))
+    stp_set_float_parameter(pd->media_settings, "PageDryTime",
+			    stp_get_float_parameter(v, "PageDryTime"));
+  if (stp_check_float_parameter(v, "ScanDryTime", STP_PARAMETER_ACTIVE))
+    stp_set_float_parameter(pd->media_settings, "ScanDryTime",
+			    stp_get_float_parameter(v, "ScanDryTime"));
+  if (stp_check_float_parameter(v, "ScanMinDryTime", STP_PARAMETER_ACTIVE))
+    stp_set_float_parameter(pd->media_settings, "ScanMinDryTime",
+			    stp_get_float_parameter(v, "ScanMinDryTime"));
+  if (stp_check_int_parameter(v, "FeedAdjustment", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "FeedAdjustment",
+			  stp_get_int_parameter(v, "FeedAdjustment"));
+  if (stp_check_int_parameter(v, "PaperThickness", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "PaperThickness",
+			  stp_get_int_parameter(v, "PaperThickness"));
+  if (stp_check_int_parameter(v, "VacuumIntensity", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "VacuumIntensity",
+			  stp_get_int_parameter(v, "VacuumIntensity"));
+  if (stp_check_int_parameter(v, "FeedSequence", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "FeedSequence",
+			  stp_get_int_parameter(v, "FeedSequence"));
+  if (stp_check_int_parameter(v, "PrintMethod", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "PrintMethod",
+			  stp_get_int_parameter(v, "PrintMethod"));
+  if (stp_check_int_parameter(v, "PlatenGap", STP_PARAMETER_ACTIVE))
+    stp_set_int_parameter(pd->media_settings, "PlatenGap",
+			  stp_get_int_parameter(v, "PlatenGap"));
 }
 
 static void
 allocate_channels(stp_vars_t *v, int line_length)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const escp2_inkname_t *ink_type = pd->inkname;
-  int i;
+  const inkname_t *ink_type = pd->inkname;
+  int i, j, k;
   int channel_id = 0;
+  int split_id = 0;
 
   pd->cols = stp_zalloc(sizeof(unsigned char *) * pd->channels_in_use);
   pd->channels =
     stp_zalloc(sizeof(physical_subchannel_t *) * pd->channels_in_use);
+  if (pd->split_channel_count)
+    pd->split_channels = stp_zalloc(sizeof(short) * pd->channels_in_use *
+				    pd->split_channel_count);
 
   for (i = 0; i < pd->logical_channels; i++)
     {
-      const ink_channel_t *channel = ink_type->channel_set->channels[i];
+      const ink_channel_t *channel = &(ink_type->channels[i]);
       if (channel)
 	{
-	  int j;
 	  for (j = 0; j < channel->n_subchannels; j++)
 	    {
+	      const physical_subchannel_t *sc = &(channel->subchannels[j]);
 	      pd->cols[channel_id] = stp_zalloc(line_length);
-	      pd->channels[channel_id] = &(channel->subchannels[j]);
+	      pd->channels[channel_id] = sc;
 	      stp_dither_add_channel(v, pd->cols[channel_id], i, j);
+	      if (pd->split_channel_count)
+		{
+		  for (k = 0; k < pd->split_channel_count; k++)
+		    pd->split_channels[split_id++] = sc->split_channels[k];
+		}
 	      channel_id++;
 	    }
 	}
     }
-  if (pd->use_aux_channels && ink_type->channel_set->aux_channel_count > 0)
+  if (pd->use_aux_channels && ink_type->aux_channel_count > 0)
     {
-      for (i = 0; i < ink_type->channel_set->aux_channel_count; i++)
+      for (i = 0; i < ink_type->aux_channel_count; i++)
 	{
-	  const ink_channel_t *channel = ink_type->channel_set->aux_channels[i];
-	  int j;
+	  const ink_channel_t *channel = &(ink_type->aux_channels[i]);
 	  for (j = 0; j < channel->n_subchannels; j++)
 	    {
+	      const physical_subchannel_t *sc = &(channel->subchannels[j]);
 	      pd->cols[channel_id] = stp_zalloc(line_length);
-	      pd->channels[channel_id] = &(channel->subchannels[j]);
+	      pd->channels[channel_id] = sc;
 	      stp_dither_add_channel(v, pd->cols[channel_id],
 				     i + pd->logical_channels, j);
+	      if (pd->split_channel_count)
+		{
+		  for (k = 0; k < pd->split_channel_count; k++)
+		    pd->split_channels[split_id++] = sc->split_channels[k];
+		}
 	      channel_id++;
 	    }
 	}
@@ -3398,20 +3518,19 @@ static void
 setup_resolution(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const res_t *res = escp2_find_resolution(v);
-  int resid = compute_resid(res);
+  const res_t *res = stp_escp2_find_resolution(v);
 
   int vertical = adjusted_vertical_resolution(res);
   int horizontal = adjusted_horizontal_resolution(res);
 
   pd->res = res;
   pd->use_extended_commands =
-    escp2_use_extended_commands(v, pd->res->softweave);
-  pd->physical_xdpi = escp2_base_res(v, compute_virtual_resid(res));
+    escp2_use_extended_commands(v, !(pd->res->command));
+  pd->physical_xdpi = escp2_base_res(v);
   if (pd->physical_xdpi > pd->res->hres)
     pd->physical_xdpi = pd->res->hres;
 
-  if (escp2_use_extended_commands(v, pd->res->softweave))
+  if (pd->use_extended_commands)
     {
       pd->unit_scale = MAX(escp2_max_hres(v), escp2_max_vres(v));
       pd->horizontal_units = horizontal;
@@ -3427,12 +3546,11 @@ setup_resolution(stp_vars_t *v)
       pd->horizontal_units = vertical;
     }
   /* Note hard-coded 1440 -- from Epson manuals */
-  if (escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) &&
-      escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_NO))
+  if (stp_escp2_has_cap(v, MODEL_COMMAND, MODEL_COMMAND_1999) &&
+      stp_escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_NO))
     pd->micro_units = 1440;
   pd->vertical_units = vertical;
   pd->page_management_units = vertical;
-  pd->printing_resolution = escp2_base_res(v, resid);
 }
 
 static void
@@ -3441,7 +3559,7 @@ setup_softweave_parameters(stp_vars_t *v)
   escp2_privdata_t *pd = get_privdata(v);
   pd->horizontal_passes = pd->res->printed_hres / pd->physical_xdpi;
   if (pd->physical_channels == 1 &&
-      (pd->inkname->channel_set->channels[0]->subchannels->split_channel_count > 1 ||
+      (pd->inkname->channels[0].subchannels->split_channel_count > 1 ||
        (pd->res->vres >=
 	(escp2_base_separation(v) / escp2_black_nozzle_separation(v)))) &&
       (escp2_max_black_resolution(v) < 0 ||
@@ -3454,18 +3572,21 @@ setup_softweave_parameters(stp_vars_t *v)
     {
       pd->nozzles = escp2_fast_nozzles(v);
       pd->nozzle_separation = escp2_fast_nozzle_separation(v);
+      pd->nozzle_start = escp2_fast_nozzle_start(v);
       pd->min_nozzles = escp2_min_fast_nozzles(v);
     }
   else if (pd->use_black_parameters)
     {
       pd->nozzles = escp2_black_nozzles(v);
       pd->nozzle_separation = escp2_black_nozzle_separation(v);
+      pd->nozzle_start = escp2_black_nozzle_start(v);
       pd->min_nozzles = escp2_min_black_nozzles(v);
     }
   else
     {
       pd->nozzles = escp2_nozzles(v);
       pd->nozzle_separation = escp2_nozzle_separation(v);
+      pd->nozzle_start = escp2_nozzle_start(v);
       pd->min_nozzles = escp2_min_nozzles(v);
     }
 }
@@ -3477,6 +3598,7 @@ setup_printer_weave_parameters(stp_vars_t *v)
   pd->horizontal_passes = 1;
   pd->nozzles = 1;
   pd->nozzle_separation = 1;
+  pd->nozzle_start = 0;
   pd->min_nozzles = 1;
   pd->use_black_parameters = 0;
 }
@@ -3491,7 +3613,7 @@ setup_head_parameters(stp_vars_t *v)
   if (strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") == 0)
     pd->logical_channels = 1;
   else
-    pd->logical_channels = pd->inkname->channel_set->channel_count;
+    pd->logical_channels = pd->inkname->channel_count;
 
   pd->physical_channels =
     compute_channel_count(pd->inkname, pd->logical_channels,
@@ -3504,16 +3626,9 @@ setup_head_parameters(stp_vars_t *v)
 			      pd->use_aux_channels);
     }
 
-  pd->use_printer_weave = use_printer_weave(v);
-  if (pd->use_printer_weave)
-    {
-      pd->printer_weave = get_printer_weave(v);
-      if (pd->res->softweave && pd->printer_weave && pd->printer_weave->value == 0)
-	pd->printer_weave = NULL;
-    }
-
+  pd->printer_weave = get_printer_weave(v);
 
-  if (escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
+  if (stp_escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
       (pd->inkname->inkset == INKSET_CMYK || pd->physical_channels == 1) &&
       pd->res->hres == pd->physical_xdpi && pd->res->vres == 360)
     pd->use_fast_360 = 1;
@@ -3523,6 +3638,7 @@ setup_head_parameters(stp_vars_t *v)
   /*
    * Set up the printer-specific parameters (weaving)
    */
+  pd->use_printer_weave = use_printer_weave(v);
   if (pd->use_printer_weave)
     setup_printer_weave_parameters(v);
   else
@@ -3538,32 +3654,52 @@ setup_head_parameters(stp_vars_t *v)
   setup_head_offset(v);
   setup_split_channels(v);
 
+  if (stp_check_string_parameter(v, "Duplex", STP_PARAMETER_ACTIVE))
+    {
+      const char *duplex = stp_get_string_parameter(v, "Duplex");
+      if (strcmp(duplex, "DuplexTumble") == 0)
+	pd->duplex = DUPLEX_TUMBLE;
+      else if (strcmp(duplex, "DuplexNoTumble") == 0)
+	pd->duplex = DUPLEX_NO_TUMBLE;
+      else
+	pd->duplex = 0;
+    }
+  if (pd->duplex)
+    pd->extra_vertical_feed = 0;
+  else
+    pd->extra_vertical_feed = escp2_extra_feed(v);
+
   if (strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") == 0 &&
       pd->physical_channels == 1)
     {
       if (pd->use_black_parameters)
 	pd->initial_vertical_offset =
-	  escp2_black_initial_vertical_offset(v) * pd->page_management_units /
+	  (escp2_black_initial_vertical_offset(v) -
+	   (escp2_black_nozzle_start(v) * (int) escp2_black_nozzle_separation(v))) *
+	  pd->page_management_units /
 	  escp2_base_separation(v);
       else
 	pd->initial_vertical_offset = pd->head_offset[0] +
-	  (escp2_initial_vertical_offset(v) *
+	  ((escp2_initial_vertical_offset(v) -
+	    (escp2_nozzle_start(v) * (int) escp2_nozzle_separation(v))) *
 	   pd->page_management_units / escp2_base_separation(v));
     }
   else
     pd->initial_vertical_offset =
-      escp2_initial_vertical_offset(v) * pd->page_management_units /
+      (escp2_initial_vertical_offset(v) -
+       (escp2_nozzle_start(v) * (int) escp2_nozzle_separation(v))) *
+      pd->page_management_units /
       escp2_base_separation(v);
 
   pd->printing_initial_vertical_offset = 0;
-  pd->bitwidth = escp2_bits(v, compute_printed_resid(pd->res));
+  pd->bitwidth = escp2_bits(v);
 }
 
 static void
 setup_page(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  const input_slot_t *input_slot = get_input_slot(v);
+  const input_slot_t *input_slot = stp_escp2_get_input_slot(v);
   int extra_left = 0;
   int extra_top = 0;
   int hub_size = 0;
@@ -3593,11 +3729,11 @@ setup_page(stp_vars_t *v)
 				   safe and print 16 mm */
     }
 
-  stp_default_media_size(v, &(pd->page_true_width), &(pd->page_true_height));
+  escp2_media_size(v, &(pd->page_true_width), &(pd->page_true_height));
   /* Don't use full bleed mode if the paper itself has a margin */
   if (pd->page_left > 0 || pd->page_top > 0)
     stp_set_boolean_parameter(v, "FullBleed", 0);
-  if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) &&
+  if (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) &&
       ((!input_slot || !(input_slot->is_cd))))
     {
       pd->page_extra_height =
@@ -3608,7 +3744,7 @@ setup_page(stp_vars_t *v)
       else
 	pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
     }
-  else if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) &&
+  else if (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) &&
 	   (stp_get_boolean_parameter(v, "FullBleed")) &&
 	   ((!input_slot || !(input_slot->is_cd))))
     {
@@ -3617,13 +3753,20 @@ setup_page(stp_vars_t *v)
 	escp2_zero_margin_offset(v) * pd->page_management_units /
 	escp2_base_separation(v);
     }
-  else if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY) &&
+  else if (stp_escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_H_ONLY) &&
 	   (stp_get_boolean_parameter(v, "FullBleed")) &&
 	   ((!input_slot || !(input_slot->is_cd))))
     {
       pd->paper_extra_bottom = 0;
       pd->page_extra_height = 0;
     }
+  else if (stp_escp2_printer_supports_duplex(v) && !pd->duplex)
+    {
+      pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
+      pd->page_extra_height =
+	max_nozzle_span(v) * pd->page_management_units /
+	escp2_base_separation(v);
+    }
   else
     {
       pd->page_extra_height = 0;
@@ -3677,7 +3820,7 @@ setup_page(stp_vars_t *v)
 	 pd->horizontal_passes);
       pd->split_channel_width = (pd->split_channel_width + 7) / 8;
       pd->split_channel_width *= pd->bitwidth;
-      if (COMPRESSION)
+      if (!(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
 	{
 	  pd->comp_buf =
 	    stp_malloc(stp_compute_tiff_linewidth(v, pd->split_channel_width));
@@ -3847,7 +3990,6 @@ static int
 escp2_print_page(stp_vars_t *v, stp_image_t *image)
 {
   int status;
-  int i;
   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;
@@ -3881,18 +4023,24 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
      ((pd->page_extra_height * pd->res->vres / pd->vertical_units) +
       (pd->image_top * pd->res->vres / 72)),
      (pd->page_extra_height +
-      (pd->page_height + escp2_extra_feed(v)) * pd->res->vres / 72),
+      (pd->page_height + pd->extra_vertical_feed) * pd->res->vres / 72),
      pd->head_offset,
      weave_pattern,
      stpi_escp2_flush_pass,
-     FILLFUNC,
-     PACKFUNC,
-     COMPUTEFUNC);
+     (((stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ||
+       pd->split_channel_count > 0) ?
+      stp_fill_uncompressed : stp_fill_tiff),
+     (((stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ||
+       pd->split_channel_count > 0) ?
+      stp_pack_uncompressed : stp_pack_tiff),
+     (((stp_get_debug_level() & STP_DBG_NO_COMPRESSION) ||
+       pd->split_channel_count > 0) ?
+      stp_compute_uncompressed_linewidth : stp_compute_tiff_linewidth));
 
   stp_dither_init(v, image, pd->image_printed_width, pd->res->printed_hres,
 		  pd->res->printed_vres);
   allocate_channels(v, line_width);
-  adjust_print_quality(v, image);
+  adjust_print_quality(v);
   out_channels = stp_color_init(v, image, 65536);
 
 /*  stpi_dither_set_expansion(v, pd->res->hres / pd->res->printed_hres); */
@@ -3900,22 +4048,8 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
   setup_inks(v);
 
   status = escp2_print_data(v, image);
-  stp_image_conclude(image);
   stp_flush_all(v);
   stpi_escp2_terminate_page(v);
-
-  /*
-   * Cleanup...
-   */
-  for (i = 0; i < pd->channels_in_use; i++)
-    if (pd->cols[i])
-      stp_free(pd->cols[i]);
-  stp_free(pd->cols);
-  stp_free(pd->channels);
-  if (pd->split_channels)
-    stp_free(pd->split_channels);
-  if (pd->comp_buf)
-    stp_free(pd->comp_buf);
   return status;
 }
 
@@ -3926,27 +4060,29 @@ static int
 escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
 {
   int status = 1;
+  int i;
 
   escp2_privdata_t *pd;
+  int page_number = stp_get_int_parameter(v, "PageNumber");
 
   if (!stp_verify(v))
     {
       stp_eprintf(v, _("Print options not verified; cannot print.\n"));
       return 0;
     }
-  stp_image_init(image);
 
   if (strcmp(stp_get_string_parameter(v, "InputImageType"), "Raw") == 0 &&
       !set_raw_ink_type(v))
     return 0;
 
   pd = (escp2_privdata_t *) stp_zalloc(sizeof(escp2_privdata_t));
+
   pd->printed_something = 0;
   pd->last_color = -1;
   pd->last_pass_offset = 0;
   pd->last_pass = -1;
   pd->send_zero_pass_advance =
-    escp2_has_cap(v, MODEL_SEND_ZERO_ADVANCE, MODEL_SEND_ZERO_ADVANCE_YES);
+    stp_escp2_has_cap(v, MODEL_SEND_ZERO_ADVANCE, MODEL_SEND_ZERO_ADVANCE_YES);
   stp_allocate_component_data(v, "Driver", NULL, NULL, pd);
 
   pd->inkname = get_inktype(v);
@@ -3956,6 +4092,12 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
     pd->use_aux_channels = 1;
   else
     pd->use_aux_channels = 0;
+  if (pd->inkname && pd->inkname->inkset == INKSET_QUADTONE &&
+      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
+    {
+      stp_eprintf(v, "Warning: Quadtone inkset only available in MONO\n");
+      stp_set_string_parameter(v, "PrintingMode", "BW");
+    }
   pd->channels_in_use = count_channels(pd->inkname, pd->use_aux_channels);
 
   setup_basic(v);
@@ -3964,15 +4106,44 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
   setup_page(v);
   setup_misc(v);
 
-  adjust_density_and_ink_type(v, image);
+  adjust_density_and_ink_type(v);
   if (print_op & OP_JOB_START)
     stpi_escp2_init_printer(v);
   if (print_op & OP_JOB_PRINT)
-    status = escp2_print_page(v, image);
+    {
+      stp_image_init(image);
+      if ((page_number & 1) && pd->duplex &&
+	  ((pd->duplex & pd->input_slot->duplex) == 0))
+	  /* If the hardware can't do the duplex operation, we need to
+	     emulate it in software */
+	image = stpi_buffer_image(image, BUFFER_FLAG_FLIP_X | BUFFER_FLAG_FLIP_Y);
+      status = escp2_print_page(v, image);
+      stp_image_conclude(image);
+    }
   if (print_op & OP_JOB_END)
     stpi_escp2_deinit_printer(v);
 
-  stp_free(pd->head_offset);
+  if (pd->head_offset)
+    stp_free(pd->head_offset);
+
+  /*
+   * Cleanup...
+   */
+  if (pd->cols)
+    {
+      for (i = 0; i < pd->channels_in_use; i++)
+	if (pd->cols[i])
+	  stp_free(pd->cols[i]);
+      stp_free(pd->cols);
+    }
+  if (pd->media_settings)
+    stp_vars_destroy(pd->media_settings);
+  if (pd->channels)
+    stp_free(pd->channels);
+  if (pd->split_channels)
+    stp_free(pd->split_channels);
+  if (pd->comp_buf)
+    stp_free(pd->comp_buf);
   stp_free(pd);
 
   return status;
@@ -4019,7 +4190,7 @@ static const stp_printfuncs_t print_escp2_printfuncs =
 {
   escp2_list_parameters,
   escp2_parameters,
-  stp_default_media_size,
+  escp2_media_size,
   escp2_imageable_area,
   escp2_maximum_imageable_area,
   escp2_limit,
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 622b0ab..c4a8ef9 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.117 2008/01/19 21:08:45 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.132 2008/07/11 01:24:25 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -44,35 +44,6 @@
 typedef unsigned long model_cap_t;
 typedef unsigned long model_featureset_t;
 
-
-#define RES_LOW		 0
-#define RES_360		 1
-#define RES_720_360	 2
-#define RES_720		 3
-#define RES_1440_720	 4
-#define RES_2880_720	 5
-#define RES_2880_1440	 6
-#define RES_2880_2880	 7
-#define RES_5760_2880	 8
-#define RES_N		 9
-
-/*
- ****************************************************************
- *                                                              *
- * DROP SIZES                                                   *
- *                                                              *
- ****************************************************************
- */
-
-typedef struct
-{
-  const char *listname;
-  short numdropsizes;
-  double dropsizes[MAX_DROP_SIZES];
-} escp2_dropsize_t;
-
-typedef const escp2_dropsize_t *escp2_drop_list_t[RES_N];
-
 /*
  ****************************************************************
  *                                                              *
@@ -81,32 +52,6 @@ typedef const escp2_dropsize_t *escp2_drop_list_t[RES_N];
  ****************************************************************
  */
 
-typedef struct
-{
-  const char *name;
-  float base_density;
-  float subchannel_cutoff;
-  float k_transition;
-  float k_lower;
-  float k_upper;
-  float cyan;
-  float magenta;
-  float yellow;
-  float black;
-  float saturation;
-  float gamma;
-  const char *hue_adjustment;
-  const char *lum_adjustment;
-  const char *sat_adjustment;
-} paper_adjustment_t;
-
-typedef struct
-{
-  const char *listname;
-  short paper_count;
-  const paper_adjustment_t *papers;
-} paper_adjustment_list_t;
-
 typedef enum
 {
   PAPER_PLAIN         = 0x01,
@@ -118,25 +63,15 @@ typedef enum
 
 typedef struct
 {
+  const char *cname;
   const char *name;
   const char *text;
   paper_class_t paper_class;
-  short paper_feed_sequence;
-  short platen_gap;
-  short feed_adjustment;
-  short vacuum_intensity;
-  short paper_thickness;
   const char *preferred_ink_type;
   const char *preferred_ink_set;
+  stp_vars_t *v;
 } paper_t;
 
-typedef struct
-{
-  const char *listname;
-  short paper_count;
-  const paper_t *papers;
-} paperlist_t;
-
 
 /*
  ****************************************************************
@@ -146,21 +81,67 @@ typedef struct
  ****************************************************************
  */
 
+/* Drop sizes are grouped under resolution because each resolution
+   has different drop sizes. */
+typedef struct
+{
+  short numdropsizes;
+  double dropsizes[MAX_DROP_SIZES];
+} escp2_dropsize_t;
+
 typedef struct
 {
   const char *name;
   const char *text;
   short hres;
   short vres;
-  short virtual_hres;
-  short virtual_vres;
   short printed_hres;
   short printed_vres;
-  short softweave;
-  short printer_weave;
   short vertical_passes;
+  stp_raw_t *command;
+  stp_vars_t *v;
 } res_t;
 
+typedef struct
+{
+  char *name;
+  res_t *resolutions;
+  size_t n_resolutions;
+} resolution_list_t;
+
+typedef struct
+{
+  char *name;
+  char *text;
+  short min_hres;
+  short min_vres;
+  short max_hres;
+  short max_vres;
+  short desired_hres;
+  short desired_vres;
+} quality_t;
+
+typedef struct
+{
+  char *name;
+  quality_t *qualities;
+  size_t n_quals;
+} quality_list_t;
+
+typedef struct
+{
+  char *name;
+  char *text;
+  stp_raw_t *command;
+} printer_weave_t;
+
+typedef struct
+{
+  char *name;
+  size_t n_printer_weaves;
+  printer_weave_t *printer_weaves;
+} printer_weave_list_t;
+
 
 /*
  ****************************************************************
@@ -180,22 +161,16 @@ typedef struct
   const char *subchannel_transition;
   const char *subchannel_value;
   const char *subchannel_scale;
-  const short split_channels[PHYSICAL_CHANNEL_LIMIT];
+  short *split_channels;
 } physical_subchannel_t;
 
 typedef struct
 {
-  const char *curve_name;
-  const char *curve;
-  stp_curve_t *curve_impl;
-} hue_curve_t;
-
-typedef struct
-{
-  const char *listname;
-  const physical_subchannel_t *subchannels;
+  const char *name;
   short n_subchannels;
-  hue_curve_t *hue_curve;
+  physical_subchannel_t *subchannels;
+  const char *hue_curve_name;
+  stp_curve_t *hue_curve;
 } ink_channel_t;
 
 typedef enum
@@ -205,179 +180,91 @@ typedef enum
   INKSET_CcMmYyK          = 2,
   INKSET_CcMmYKk          = 3,
   INKSET_QUADTONE         = 4,
-  INKSET_CMYKRB		  = 5,
+  INKSET_OTHER		  = 5,
   INKSET_EXTENDED	  = 6
 } inkset_id_t;
 
 typedef struct
 {
   const char *name;
-  const ink_channel_t *const *channels;
-  const ink_channel_t *const *aux_channels;
+  const char *text;
   short channel_count;
   short aux_channel_count;
-} channel_set_t;
-
-typedef struct
-{
-  const char *name;
-  const char *text;
   inkset_id_t inkset;
-  const channel_set_t *channel_set;
-} escp2_inkname_t;
+  ink_channel_t *channels;
+  ink_channel_t *aux_channels;
+} inkname_t;
 
 typedef struct
 {
   int n_shades;
-  double shades[PHYSICAL_CHANNEL_LIMIT];
+  double *shades;
 } shade_t;
 
-typedef shade_t shade_set_t[PHYSICAL_CHANNEL_LIMIT];
-
 typedef struct
 {
   const char *name;
   const char *text;
-  const escp2_inkname_t *const *inknames;
-  const char *papers;
-  const char *paper_adjustments;
-  const shade_set_t *shades;
+  short n_shades;
   short n_inks;
+  shade_t *shades;
+  inkname_t *inknames;
 } inklist_t;
 
 typedef struct
 {
-  const char *listname;
-  const inklist_t *const *inklists;
+  const char *name;
   short n_inklists;
+  inklist_t *inklists;
 } inkgroup_t;
-
-typedef struct
-{
-  const char *listname;
-  int count;
-  const char *const *names;
-} channel_name_t;
     
 
 /*
  ****************************************************************
  *                                                              *
- * MISCELLANEOUS                                                *
+ * INPUT SLOTS                                                  *
  *                                                              *
  ****************************************************************
  */
 
-/*
- * For each printer, we can select from a variety of dot sizes.
- * For single dot size printers, the available sizes are usually 0,
- * which is the "default", and some subset of 1-4.  For simple variable
- * dot size printers (with only one kind of variable dot size), the
- * variable dot size is specified as 0x10.  For newer printers, there
- * is a choice of variable dot sizes available, 0x10, 0x11, and 0x12 in
- * order of increasing size.
- *
- * Normally, we want to specify the smallest dot size that lets us achieve
- * a density of less than .8 or thereabouts (above that we start to get
- * some dither artifacts).  This needs to be tested for each printer and
- * resolution.
- *
- * An entry of -1 in a slot means that this resolution is not available.
- */
-
-typedef short escp2_dot_size_t[RES_N];
-
-/*
- * Choose the number of bits to use at each resolution.
- */
-
-typedef short escp2_bits_t[RES_N];
-
-/*
- * Choose the base resolution to use at each resolution.
- */
-
-typedef short escp2_base_resolutions_t[RES_N];
-
-/*
- * Specify the base density for each available resolution.
- * This obviously depends upon the dot size.
- */
-
-typedef float escp2_densities_t[RES_N];
-
 #define ROLL_FEED_CUT_ALL (1)
 #define ROLL_FEED_CUT_LAST (2)
 #define ROLL_FEED_DONT_EJECT (4)
 
+#define DUPLEX_NO_TUMBLE (1)
+#define DUPLEX_TUMBLE (2)
+
 typedef struct
 {
   const char *name;
   const char *text;
   short is_cd;
   short is_roll_feed;
+  short duplex;
   unsigned roll_feed_cut_flags;
-  const stp_raw_t init_sequence;
-  const stp_raw_t deinit_sequence;
+  const stp_raw_t *init_sequence;
+  const stp_raw_t *deinit_sequence;
 } input_slot_t;
 
-typedef struct
-{
-  const char *name;
-  const input_slot_t *slots;
-  size_t n_input_slots;
-} input_slot_list_t;
-
-typedef struct
-{
-  const char *name;
-  const char *text;
-  short min_hres;
-  short min_vres;
-  short max_hres;
-  short max_vres;
-  short desired_hres;
-  short desired_vres;
-} quality_t;
-
-typedef struct
-{
-  const char *name;
-  const quality_t *qualities;
-  size_t n_quals;
-} quality_list_t;
-
-typedef enum
-{
-  AUTO_MODE_QUALITY,
-  AUTO_MODE_MANUAL
-} auto_mode_t;
-
-typedef struct
-{
-  const char *name;
-  const char *text;
-  short value;
-} printer_weave_t;
-
-typedef struct
-{
-  const char *name;
-  size_t n_printer_weaves;
-  const printer_weave_t *printer_weaves;
-} printer_weave_list_t;
+/*
+ ****************************************************************
+ *                                                              *
+ * FLAGS                                                        *
+ *                                                              *
+ ****************************************************************
+ */
 
 #define MODEL_COMMAND_MASK	0xful /* What general command set does */
-#define MODEL_COMMAND_1998	0x0ul
-#define MODEL_COMMAND_1999	0x1ul /* The 1999 series printers */
-#define MODEL_COMMAND_2000	0x2ul /* The 2000 series printers */
+#define MODEL_COMMAND_1998	0x0ul /* Old (ESC .) printers */
+#define MODEL_COMMAND_1999	0x1ul /* ESC i printers w/o extended ESC(c */
+#define MODEL_COMMAND_2000	0x2ul /* ESC i printers with extended ESC(c */
 #define MODEL_COMMAND_PRO	0x3ul /* Stylus Pro printers */
 
 #define MODEL_ZEROMARGIN_MASK	0x30ul /* Does this printer support */
 #define MODEL_ZEROMARGIN_NO	0x00ul /* zero margin mode? */
-#define MODEL_ZEROMARGIN_YES	0x10ul /* (print to edge of the paper) */
-#define MODEL_ZEROMARGIN_FULL	0x20ul /* (print to edge of the paper) */
-#define MODEL_ZEROMARGIN_H_ONLY	0x30ul /* (print to edge of the paper) */
+#define MODEL_ZEROMARGIN_YES	0x10ul /* (print beyond bottom of page) */
+#define MODEL_ZEROMARGIN_FULL	0x20ul /* (do not print beyond bottom) */
+#define MODEL_ZEROMARGIN_H_ONLY	0x30ul /* (no special treatment for vertical) */
 
 #define MODEL_VARIABLE_DOT_MASK	0x40ul /* Does this printer support var */
 #define MODEL_VARIABLE_NO	0x00ul /* dot size printing? The newest */
@@ -387,33 +274,29 @@ typedef struct
 #define MODEL_GRAYMODE_NO	0x00ul /* fast black printing? */
 #define MODEL_GRAYMODE_YES	0x80ul
 
-#define MODEL_VACUUM_MASK	0x100ul
-#define MODEL_VACUUM_NO		0x000ul
-#define MODEL_VACUUM_YES	0x100ul
-
-#define MODEL_FAST_360_MASK	0x200ul
+#define MODEL_FAST_360_MASK	0x100ul
 #define MODEL_FAST_360_NO	0x000ul
-#define MODEL_FAST_360_YES	0x200ul
+#define MODEL_FAST_360_YES	0x100ul
 
-#define MODEL_SEND_ZERO_ADVANCE_MASK	0x400ul
+#define MODEL_SEND_ZERO_ADVANCE_MASK	0x200ul
 #define MODEL_SEND_ZERO_ADVANCE_NO	0x000ul
-#define MODEL_SEND_ZERO_ADVANCE_YES	0x400ul
+#define MODEL_SEND_ZERO_ADVANCE_YES	0x200ul
 
-#define MODEL_SUPPORTS_INK_CHANGE_MASK	0x800ul
+#define MODEL_SUPPORTS_INK_CHANGE_MASK	0x400ul
 #define MODEL_SUPPORTS_INK_CHANGE_NO	0x000ul
-#define MODEL_SUPPORTS_INK_CHANGE_YES	0x800ul
+#define MODEL_SUPPORTS_INK_CHANGE_YES	0x400ul
 
-#define MODEL_PACKET_MODE_MASK	0x1000ul
-#define MODEL_PACKET_MODE_NO	0x0000ul
-#define MODEL_PACKET_MODE_YES	0x1000ul
+#define MODEL_PACKET_MODE_MASK	0x800ul
+#define MODEL_PACKET_MODE_NO	0x000ul
+#define MODEL_PACKET_MODE_YES	0x800ul
 
-#define MODEL_INTERCHANGEABLE_INK_MASK	0x2000ul
+#define MODEL_INTERCHANGEABLE_INK_MASK	0x1000ul
 #define MODEL_INTERCHANGEABLE_INK_NO	0x0000ul
-#define MODEL_INTERCHANGEABLE_INK_YES	0x2000ul
+#define MODEL_INTERCHANGEABLE_INK_YES	0x1000ul
 
-#define MODEL_ENVELOPE_LANDSCAPE_MASK	0x4000ul
+#define MODEL_ENVELOPE_LANDSCAPE_MASK	0x2000ul
 #define MODEL_ENVELOPE_LANDSCAPE_NO	0x0000ul
-#define MODEL_ENVELOPE_LANDSCAPE_YES	0x4000ul
+#define MODEL_ENVELOPE_LANDSCAPE_YES	0x2000ul
 
 typedef enum
 {
@@ -421,7 +304,6 @@ typedef enum
   MODEL_ZEROMARGIN,
   MODEL_VARIABLE_DOT,
   MODEL_GRAYMODE,
-  MODEL_VACUUM,
   MODEL_FAST_360,
   MODEL_SEND_ZERO_ADVANCE,
   MODEL_SUPPORTS_INK_CHANGE,
@@ -433,17 +315,22 @@ typedef enum
 
 typedef struct escp2_printer
 {
+  int		active;
+/*****************************************************************************/
   model_cap_t	flags;		/* Bitmask of flags, see above */
 /*****************************************************************************/
   /* Basic head configuration */
   short		nozzles;	/* Number of nozzles per color */
   short		min_nozzles;	/* Minimum number of nozzles per color */
+  short		nozzle_start;	/* Starting usable nozzle */
   short		nozzle_separation; /* Separation between rows, in 1/360" */
   short		black_nozzles;	/* Number of black nozzles (may be extra) */
   short		min_black_nozzles;	/* # of black nozzles (may be extra) */
+  short		black_nozzle_start;	/* Starting usable nozzle */
   short		black_nozzle_separation; /* Separation between rows */
   short		fast_nozzles;	/* Number of fast nozzles */
   short		min_fast_nozzles;	/* # of fast nozzles (may be extra) */
+  short		fast_nozzle_start;	/* Starting usable nozzle */
   short		fast_nozzle_separation; /* Separation between rows */
   short		physical_channels; /* Number of ink channels */
 /*****************************************************************************/
@@ -528,39 +415,73 @@ typedef struct escp2_printer
   short		alternate_alignment_passes;
   short		alternate_alignment_choices;
 /*****************************************************************************/
-  const short *dot_sizes;	/* Vector of dot sizes for resolutions */
-  const float *densities;	/* List of densities for each printer */
-  const char *drops; /* Drop sizes */
-/*****************************************************************************/
-  const char *reslist;
-  const char *inkgroup;
-/*****************************************************************************/
-  const short *bits;
-  const short *base_resolutions;
-  const char *input_slots;
-/*****************************************************************************/
-  const char *quality_list;
-  const stp_raw_t *preinit_sequence;
-  const stp_raw_t *postinit_remote_sequence;
-/*****************************************************************************/
-  const stp_raw_t *vertical_borderless_sequence;
-  const char *const printer_weaves;
-  const char *channel_names;
+  stp_raw_t *preinit_sequence;
+  stp_raw_t *preinit_remote_sequence;
+  stp_raw_t *postinit_sequence;
+  stp_raw_t *postinit_remote_sequence;
+  stp_raw_t *vertical_borderless_sequence;
+/*****************/
+  stp_mxml_node_t *media;
+  stp_list_t *media_cache;
+  stp_string_list_t *papers;
+/*****************/
+  stp_mxml_node_t *slots;
+  stp_list_t *slots_cache;
+  stp_string_list_t *input_slots;
+/*****************/
+  stp_mxml_node_t *media_sizes;
+/*****************/
+  stp_string_list_t *channel_names;
+/*****************/
+  resolution_list_t *resolutions;
+/*****************/
+  printer_weave_list_t *printer_weaves;
+/*****************/
+  quality_list_t *quality_list;
+/*****************/
+  inkgroup_t *inkgroup;
 } stpi_escp2_printer_t;
 
-extern const stpi_escp2_printer_t stpi_escp2_model_capabilities[];
-extern const int stpi_escp2_model_limit;
+/* From escp2-channels.c: */
+
+extern const inkname_t *stpi_escp2_get_default_black_inkset(void);
+extern int stp_escp2_load_inkgroup(const stp_vars_t *v, const char *name);
+
+/* From escp2-papers.c: */
+extern int stp_escp2_load_media(const stp_vars_t *v, const char *name);
+extern int stp_escp2_has_media_feature(const stp_vars_t *v, const char *name);
+extern const paper_t *stp_escp2_get_default_media_type(const stp_vars_t *v);
+extern const paper_t *stp_escp2_get_media_type(const stp_vars_t *v, int ignore_res);
+extern int stp_escp2_printer_supports_rollfeed(const stp_vars_t *v);
+extern int stp_escp2_printer_supports_print_to_cd(const stp_vars_t *v);
+extern int stp_escp2_printer_supports_duplex(const stp_vars_t *v);
+
+extern int stp_escp2_load_input_slots(const stp_vars_t *v, const char *name);
+extern const input_slot_t *stp_escp2_get_input_slot(const stp_vars_t *v);
+
+extern int stp_escp2_load_media_sizes(const stp_vars_t *v, const char *name);
+extern void stp_escp2_set_media_size(stp_vars_t *v, const stp_vars_t *src);
+
+/* From escp2-resolutions.c: */
+extern int stp_escp2_load_resolutions(const stp_vars_t *v, const char *name);
+extern int stp_escp2_load_resolutions_from_xml(const stp_vars_t *v, stp_mxml_node_t *node);
+extern int stp_escp2_load_printer_weaves(const stp_vars_t *v, const char *name);
+extern int stp_escp2_load_printer_weaves_from_xml(const stp_vars_t *v, stp_mxml_node_t *node);
+extern int stp_escp2_load_quality_presets(const stp_vars_t *v, const char *name);
+extern int stp_escp2_load_quality_presets_from_xml(const stp_vars_t *v, stp_mxml_node_t *node);
+
+/* From print-escp2.c: */
+extern const res_t *stp_escp2_find_resolution(const stp_vars_t *v);
+extern const inklist_t *stp_escp2_inklist(const stp_vars_t *v);
+
+/* From print-escp2-data.c: */
+extern void stp_escp2_load_model(const stp_vars_t *v, int model);
+extern stpi_escp2_printer_t *stp_escp2_get_printer(const stp_vars_t *v);
+extern model_featureset_t stp_escp2_get_cap(const stp_vars_t *v,
+					    escp2_model_option_t feature);
+extern int stp_escp2_has_cap(const stp_vars_t *v, escp2_model_option_t feature,
+			     model_featureset_t class);
 
-extern const paper_adjustment_list_t *stpi_escp2_get_paper_adjustment_list_named(const char *);
-extern const paperlist_t *stpi_escp2_get_paperlist_named(const char *);
-extern const quality_list_t *stpi_escp2_get_quality_list_named(const char *);
-extern const escp2_inkname_t *stpi_escp2_get_default_black_inkset(void);
-extern const inkgroup_t *stpi_escp2_get_inkgroup_named(const char *);
-extern const input_slot_list_t *stpi_escp2_get_input_slot_list_named(const char *);
-extern const res_t *const *stpi_escp2_get_reslist_named(const char *);
-extern const escp2_drop_list_t *stpi_escp2_get_drop_list_named(const char *);
-extern const printer_weave_list_t *stpi_escp2_get_printer_weaves_named(const char *);
-extern const channel_name_t *stpi_escp2_get_channel_names_named(const char *);
 
 typedef struct
 {
@@ -568,6 +489,7 @@ typedef struct
   int nozzles;			/* Number of nozzles */
   int min_nozzles;		/* Fewest nozzles we're allowed to use */
   int nozzle_separation;	/* Nozzle separation, in dots */
+  int nozzle_start;		/* First usable nozzle */
   int *head_offset;		/* Head offset (for C80-type printers) */
   int max_head_offset;		/* Largest head offset */
   int page_management_units;	/* Page management units (dpi) */
@@ -577,15 +499,14 @@ typedef struct
   int unit_scale;		/* Scale factor for units */
   int send_zero_pass_advance;	/* Send explicit command for zero advance */
   int zero_margin_offset;	/* Zero margin offset */
-  int split_channel_count;	/* For split black channels, like C120 */
-  int split_channel_width;	/* Linewidth for split black channels */
+  int split_channel_count;	/* For split channels, like C120 */
+  int split_channel_width;	/* Linewidth for split channels */
   short *split_channels;
 
   /* Ink parameters */
   int bitwidth;			/* Number of bits per ink drop */
   int drop_size;		/* ID of the drop size we're using */
-  int ink_resid;		/* Array index for the drop set we're using */
-  const escp2_inkname_t *inkname; /* Description of the ink set */
+  const inkname_t *inkname;	/* Description of the ink set */
   int use_aux_channels;		/* Use gloss channel */
 
   /* Ink channels */
@@ -603,29 +524,31 @@ typedef struct
   int use_extended_commands;	/* Do we use the extended commands? */
   const input_slot_t *input_slot; /* Input slot description */
   const paper_t *paper_type;	/* Paper type */
-  const paper_adjustment_t *paper_adjustment;	/* Paper adjustments */
+  stp_vars_t *media_settings;	/* Hardware media settings */
   const inkgroup_t *ink_group;	/* Which set of inks */
-  const stp_raw_t *init_sequence; /* Initialization sequence */
+  const stp_raw_t *preinit_sequence; /* Initialization sequence */
+  const stp_raw_t *preinit_remote_sequence; /* Initialization sequence */
   const stp_raw_t *deinit_sequence; /* De-initialization sequence */
+  const stp_raw_t *deinit_remote_sequence; /* De-initialization sequence */
   const stp_raw_t *borderless_sequence; /* Vertical borderless sequence */
   model_featureset_t command_set; /* Which command set this printer supports */
   int variable_dots;		/* Print supports variable dot sizes */
-  int has_vacuum;		/* Printer supports vacuum command */
   int has_graymode;		/* Printer supports fast grayscale mode */
   int base_separation;		/* Basic unit of separation */
   int resolution_scale;		/* Scale factor for ESC(D command */
-  int printing_resolution;	/* Printing resolution for this resolution */
   int separation_rows;		/* Row separation scaling */
   int pseudo_separation_rows;	/* Special row separation for some printers */
   int extra_720dpi_separation;	/* Special separation needed at 720 DPI */
   int bidirectional_upper_limit; /* Max total resolution for auto-bidi */
+  int duplex;
+  int extra_vertical_feed;	/* Extra vertical feed */
 
   /* weave parameters */
   int horizontal_passes;	/* Number of horizontal passes required
 				   to print a complete row */
   int physical_xdpi;		/* Horizontal distance between dots in pass */
   const res_t *res;		/* Description of the printing resolution */
-  const printer_weave_t *printer_weave; /* Printer weave parameters */
+  const stp_raw_t *printer_weave; /* Printer weave parameters */
   int use_printer_weave;	/* Use the printer weaving mechanism */
 
   /* page parameters */		/* Indexed from top left */
@@ -686,5 +609,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.117 2008/01/19 21:08:45 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.132 2008/07/11 01:24:25 rlk Exp $".
  */
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 005ed1e..1106fe7 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.155 2007/08/27 00:44:12 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.157 2008/07/24 00:15:33 rlk Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -266,43 +266,43 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("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, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -354,18 +354,18 @@ static const float_param_t float_parameters[] =
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
 };    
@@ -2024,21 +2024,21 @@ densityDivisor /= 1.2;
       {
 	stp_channel_set_density_adjustment
 	  (v, STP_ECOLOR_C, 1, (get_double_param(v, "CyanDensity") *
-			    get_double_param(v, "LightCyanTransition") *
+			    get_double_param(v, "LightCyanTrans") *
 			    get_double_param(v, "Density")));
       }
     if (cols.p.M)
       {
 	stp_channel_set_density_adjustment
 	  (v, STP_ECOLOR_M, 1, (get_double_param(v, "MagentaDensity") *
-			    get_double_param(v, "LightMagentaTransition") *
+			    get_double_param(v, "LightMagentaTrans") *
 			    get_double_param(v, "Density")));
       }
     if (cols.p.Y)
       {
 	stp_channel_set_density_adjustment
 	  (v, STP_ECOLOR_Y, 1, (get_double_param(v, "YellowDensity") *
-			    get_double_param(v, "LightYellowTransition") *
+			    get_double_param(v, "LightYellowTrans") *
 			    get_double_param(v, "Density")));
       }
   }
@@ -2624,8 +2624,6 @@ lexmark_write(const stp_vars_t *v,		/* I - Print file or command */
   }
 
   /* Send a line of raster graphics... */
-
-  return 0;
 }
 
 
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 29c4f20..a0dc7e0 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.83 2007/12/27 20:34:28 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.89 2008/08/14 01:01:41 rlk Exp $"
  *
  *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
@@ -137,6 +137,8 @@ typedef struct {
   size_t n_items;
 } laminate_list_t;
 
+#define NPUTC_BUFSIZE (4096)
+
 typedef struct
 {
   int w_dpi, h_dpi;
@@ -147,6 +149,7 @@ typedef struct
   const char* pagesize;
   const laminate_t* laminate;
   int print_mode;
+  char nputc_buf[NPUTC_BUFSIZE];
 } dyesub_privdata_t;
 
 static dyesub_privdata_t privdata;
@@ -164,6 +167,7 @@ typedef struct {
   int imgh_px, imgw_px;
   int prnh_px, prnw_px, prnt_px, prnb_px, prnl_px, prnr_px;
   int print_mode;	/* portrait or landscape */
+  int image_rows;
 } dyesub_print_vars_t;
 
 typedef struct /* printer specific parameters */
@@ -970,7 +974,10 @@ static const dyesub_pagesize_t updp10_page[] =
 {
   { "w288h432", "UPC-10P23 (4x6)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
   { "w288h387", "UPC-10P34 (4x5)", -1, 384, 12, 12, 16, 16, DYESUB_LANDSCAPE},
+#if 0
+  /* We can't have two paper sizes that are the same size --rlk 20080813 */
   { "w288h432", "UPC-10S01 (Sticker)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
+#endif
   { "Custom", NULL, -1, -1, 12, 12, 0, 0, DYESUB_LANDSCAPE},
 };
 
@@ -1221,7 +1228,7 @@ static void updr150_printer_end_func(stp_vars_t *v)
 static const dyesub_pagesize_t cx400_page[] =
 {
   { "w288h432", NULL, 295, 428, 24, 24, 23, 22, DYESUB_PORTRAIT},
-  { "w288h387", "4x5 3/8 (Digital Camera 3:4)", 295, 386, 24, 24, 23, 23, DYESUB_PORTRAIT},
+  { "w288h387", "4x5 3/8", 295, 386, 24, 24, 23, 23, DYESUB_PORTRAIT},
   { "w288h504", NULL, 295, 513, 24, 24, 23, 22, DYESUB_PORTRAIT},
   { "Custom", NULL, 295, 428, 0, 0, 0, 0, DYESUB_PORTRAIT},
 };
@@ -1697,49 +1704,49 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("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, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Laminate", N_("Laminate Pattern"), N_("Advanced Printer Setup"),
     N_("Laminate Pattern"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 0, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 0, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Borderless", N_("Borderless"), N_("Advanced Printer Setup"),
     N_("Print without borders"),
     STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 0, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 0, STP_CHANNEL_NONE, 1, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -2167,9 +2174,24 @@ dyesub_describe_output(const stp_vars_t *v)
 static void
 dyesub_nputc(stp_vars_t *v, char byte, int count)
 {
-  int i;
-  for (i = 0; i < count; i++)
+  if (count == 1)
     stp_putc(byte, v);
+  else
+    {
+      int i;
+      char *buf = privdata.nputc_buf;
+      int size = count;
+      int blocks = size / NPUTC_BUFSIZE;
+      int leftover = size % NPUTC_BUFSIZE;
+      if (size > NPUTC_BUFSIZE)
+	size = NPUTC_BUFSIZE;
+      (void) memset(buf, byte, size);
+      if (blocks)
+	for (i = 0; i < blocks; i++)
+	  stp_zfwrite(buf, size, 1, v);
+      if (leftover)
+	stp_zfwrite(buf, leftover, 1, v);
+    }
 }
 
 static void
@@ -2220,9 +2242,10 @@ dyesub_interpolate(int oldval, int oldsize, int newsize)
 }
 
 static void
-dyesub_free_image(unsigned short** image_data, stp_image_t *image)
+dyesub_free_image(dyesub_print_vars_t *pv, stp_image_t *image)
 {
-  int image_px_height = stp_image_height(image);
+  unsigned short** image_data = pv->image_data;
+  int image_px_height = pv->image_rows;
   int i;
 
   for (i = 0; i< image_px_height; i++)
@@ -2245,6 +2268,7 @@ dyesub_read_image(stp_vars_t *v,
   int i;
 
   image_data = stp_zalloc(image_px_height * sizeof(unsigned short *));
+  pv->image_rows = 0;
   if (!image_data)
     return NULL;	/* ? out of memory ? */
 
@@ -2255,22 +2279,21 @@ dyesub_read_image(stp_vars_t *v,
 	  stp_deprintf(STP_DBG_DYESUB,
 	  	"dyesub_read_image: "
 		"stp_color_get_row(..., %d, ...) == 0\n", i);
-	  dyesub_free_image(image_data, image);
+	  dyesub_free_image(pv, image);
 	  return NULL;
 	}	
       image_data[i] = stp_malloc(row_size);
+      pv->image_rows = i+1;
       if (!image_data[i])
         {
 	  stp_deprintf(STP_DBG_DYESUB,
 	  	"dyesub_read_image: "
 		"(image_data[%d] = stp_malloc()) == NULL\n", i);
-	  dyesub_free_image(image_data, image);
+	  dyesub_free_image(pv, image);
 	  return NULL;
 	}	
       memcpy(image_data[i], stp_channel_get_output(v), row_size);
     }
-  stp_image_conclude(image);
-
   return image_data;
 }
 
@@ -2449,6 +2472,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
       stp_eprintf(v, _("Print options not verified; cannot print.\n"));
       return 0;
     }
+  (void) memset(&pv, 0, sizeof(pv));
 
   stp_image_init(image);
   pv.imgw_px = stp_image_width(image);
@@ -2531,7 +2555,10 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   pv.plane_interlacing = dyesub_feature(caps, DYESUB_FEATURE_PLANE_INTERLACE);
   pv.print_mode = page_mode;
   if (!pv.image_data)
-      return 2;	
+    {
+      stp_image_conclude(image);
+      return 2;
+    }
   /* /FIXME */
 
 
@@ -2540,7 +2567,6 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   dyesub_adjust_curve(v, caps->adj_yellow, "YellowCurve");
   stp_set_float_parameter(v, "Density", 1.0);
 
-
   if (dyesub_feature(caps, DYESUB_FEATURE_FULL_HEIGHT))
     {
       pv.prnt_px = 0;
@@ -2611,7 +2637,8 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
   /* printer end */
   dyesub_exec(v, caps->printer_end_func, "caps->printer_end");
 
-  dyesub_free_image(pv.image_data, image);
+  dyesub_free_image(&pv, image);
+  stp_image_conclude(image);
   return status;
 }
 
diff --git a/src/main/print-papers.c b/src/main/print-papers.c
index 79dd59a..48ae5f8 100644
--- a/src/main/print-papers.c
+++ b/src/main/print-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-papers.c,v 1.38 2008/01/15 03:48:46 rlk Exp $"
+ * "$Id: print-papers.c,v 1.41 2008/07/13 18:05:16 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -125,30 +125,6 @@ stpi_paper_create(stp_papersize_t *p)
   return 0;
 }
 
-static int
-stpi_paper_destroy(stp_papersize_t *p)
-{
-  stp_list_item_t *paper_item;
-  check_paperlist();
-
-  /* Check if paper exists */
-  paper_item = stp_list_get_start(paper_list);
-  while (paper_item)
-    {
-      const stp_papersize_t *ep = (const stp_papersize_t *)
-	stp_list_item_get_data(paper_item);
-      if (ep && !strcmp(p->name, ep->name))
-	{
-	  stp_list_item_destroy (paper_list, paper_item);
-	  return 0;
-	}
-      paper_item = stp_list_item_next(paper_item);
-    }
-  /* Paper did not exist */
-  return 1;
-}
-
-
 int
 stp_known_papersizes(void)
 {
@@ -187,7 +163,7 @@ paper_size_mismatch(int l, int w, const stp_papersize_t *val)
 {
   int hdiff = abs(l - (int) val->height);
   int vdiff = abs(w - (int) val->width);
-  return hdiff + vdiff;
+  return hdiff > vdiff ? hdiff : vdiff;
 }
 
 const stp_papersize_t *
@@ -203,11 +179,17 @@ stp_get_papersize_by_size(int l, int w)
       val = stp_get_papersize_by_index(i);
 
       if (val->width == w && val->height == l)
-	return val;
+	{
+	  if (val->top == 0 && val->left == 0 &&
+	      val->bottom == 0 && val->right == 0)
+	    return val;
+	  else
+	    ref = val;
+	}
       else
 	{
 	  int myscore = paper_size_mismatch(l, w, val);
-	  if (myscore < score && myscore < 20)
+	  if (myscore < score && myscore < 5)
 	    {
 	      ref = val;
 	      score = myscore;
@@ -217,6 +199,29 @@ stp_get_papersize_by_size(int l, int w)
   return ref;
 }
 
+const stp_papersize_t *
+stp_get_papersize_by_size_exact(int l, int w)
+{
+  const stp_papersize_t *ref = NULL;
+  const stp_papersize_t *val = NULL;
+  int i;
+  int sizes = stp_known_papersizes();
+  for (i = 0; i < sizes; i++)
+    {
+      val = stp_get_papersize_by_index(i);
+
+      if (val->width == w && val->height == l)
+	{
+	  if (val->top == 0 && val->left == 0 &&
+	      val->bottom == 0 && val->right == 0)
+	    return val;
+	  else
+	    ref = val;
+	}
+    }
+  return ref;
+}
+
 void
 stp_default_media_size(const stp_vars_t *v,	/* I */
 		       int  *width,		/* O - Width in points */
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index 2455aa6..fa107cd 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.150 2008/04/26 01:15:11 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.156 2008/08/06 22:49:05 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -37,7 +37,6 @@
 #include <string.h>
 
 /* #define DEBUG */
-/* #define PCL_DEBUG_DISABLE_COMPRESSION */
 /* #define PCL_DEBUG_DISABLE_BLANKLINE_REMOVAL */
 
 /*
@@ -274,26 +273,16 @@ static const pcl_t pcl_resolutions[] =
 };
 #define NUM_RESOLUTIONS		(sizeof(pcl_resolutions) / sizeof (pcl_t))
 
-static void
-pcl_describe_resolution(const stp_vars_t *v, int *x, int *y)
+static const pcl_t pcl_qualities[] =
 {
-  int i;
-  const char *resolution = stp_get_string_parameter(v, "Resolution");
-  if (resolution)
-    {
-      for (i = 0; i < NUM_RESOLUTIONS; i++)
-	{
-	  if (!strcmp(resolution, pcl_resolutions[i].pcl_name))
-	    {
-	      *x = pcl_resolutions[i].p0;
-	      *y = pcl_resolutions[i].p1;
-	      return;
-	    }
-	}
-    }
-  *x = -1;
-  *y = -1;
-}
+    { "Draft", N_("Draft"), PCL_RES_150_150, 150, 150},
+    { "Standard", N_("Standard"), PCL_RES_300_300, 300, 300},
+    { "High", N_("High"), PCL_RES_600_600, 600, 600},
+    { "High", N_("Standard"), PCL_RES_600_300, 600, 300},
+    { "Photo", N_("Photo"), PCL_RES_1200_600, 1200, 600},
+    { "Photo", N_("Photo"), PCL_RES_2400_600, 2400, 600},
+};
+#define NUM_QUALITIES		(sizeof(pcl_qualities) / sizeof (pcl_t))
 
 typedef struct {
   int top_margin;
@@ -1264,49 +1253,55 @@ static const stp_parameter_t the_parameters[] =
     "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
     N_("Size of the paper being printed to"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "MediaType", N_("Media Type"), N_("Basic Printer Setup"),
     N_("Type of media (plain paper, photo paper, etc.)"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InputSlot", N_("Media Source"), N_("Basic Printer Setup"),
     N_("Source (input slot) of the media"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "Quality", N_("Print Quality"), N_("Basic Output Adjustment"),
+    N_("Print Quality"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
-    N_("Resolution and quality of the print"),
+    N_("Resolution of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkType", N_("Ink Type"), N_("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, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "InkChannels", N_("Ink Channels"), N_("Advanced Printer Functionality"),
     N_("Ink Channels"),
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
     N_("Duplex/Tumble Setting"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -1358,18 +1353,18 @@ static const float_param_t float_parameters[] =
   },
   {
     {
-      "LightCyanTransition", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
+      "LightCyanTrans", N_("Light Cyan Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Cyan Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
   {
     {
-      "LightMagentaTransition", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
+      "LightMagentaTrans", N_("Light Magenta Transition"), N_("Advanced Ink Adjustment"),
       N_("Light Magenta Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
     }, 0.0, 5.0, 1.0, 1
   },
 };
@@ -1492,6 +1487,51 @@ pcl_get_model_capabilities(int model)	/* I: Model */
 }
 
 /*
+ * Determine the current resolution based on quality and resolution settings
+ */
+
+static void
+pcl_describe_resolution(const stp_vars_t *v, int *x, int *y)
+{
+  int i;
+  int model = stp_get_model_id(v);
+  const char *resolution = stp_get_string_parameter(v, "Resolution");
+  const char *quality;
+  const pcl_cap_t *caps = NULL;
+  if (resolution)
+    {
+      for (i = 0; i < NUM_RESOLUTIONS; i++)
+	{
+	  if (!strcmp(resolution, pcl_resolutions[i].pcl_name))
+	    {
+	      *x = pcl_resolutions[i].p0;
+	      *y = pcl_resolutions[i].p1;
+	      return;
+	    }
+	}
+    }
+  quality = stp_get_string_parameter(v, "Quality");
+  caps = pcl_get_model_capabilities(model);
+  if (quality && strcmp(quality, "None") == 0)
+    quality = "Standard";
+  if (quality)
+    {
+      for (i = 0; i < NUM_QUALITIES; i++)
+	{
+	  if ((caps->resolutions & pcl_qualities[i].pcl_code) &&
+	      !strcmp(quality, pcl_qualities[i].pcl_name))
+	    {
+	      *x = pcl_qualities[i].p0;
+	      *y = pcl_qualities[i].p1;
+	      return;
+	    }
+	}
+    }
+  *x = -1;
+  *y = -1;
+}
+
+/*
  * Convert Media size name into PCL media code for printer
  */
 
@@ -1662,6 +1702,14 @@ pcl_parameters(const stp_vars_t *v, const char *name,
   stp_deprintf(STP_DBG_PCL, "Resolutions: %d\n", caps->resolutions);
   stp_deprintf(STP_DBG_PCL, "ColorType = %d, PrinterType = %d\n", caps->color_type, caps->stp_printer_type);
 
+  for (i = 0; i < the_parameter_count; i++)
+    if (strcmp(name, the_parameters[i].name) == 0)
+      {
+	stp_fill_parameter_settings(description, &(the_parameters[i]));
+	break;
+      }
+  description->deflt.str = NULL;
+
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)
       {
@@ -1670,15 +1718,8 @@ pcl_parameters(const stp_vars_t *v, const char *name,
 	description->deflt.dbl = float_parameters[i].defval;
 	description->bounds.dbl.upper = float_parameters[i].max;
 	description->bounds.dbl.lower = float_parameters[i].min;
-      }
-
-  for (i = 0; i < the_parameter_count; i++)
-    if (strcmp(name, the_parameters[i].name) == 0)
-      {
-	stp_fill_parameter_settings(description, &(the_parameters[i]));
 	break;
       }
-  description->deflt.str = NULL;
 
   if (strcmp(name, "PageSize") == 0)
     {
@@ -1735,15 +1776,11 @@ pcl_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "Resolution") == 0)
   {
     description->bounds.str = stp_string_list_create();
-    description->deflt.str = NULL;
+    stp_string_list_add_string(description->bounds.str, "None", _("Default"));
+    description->deflt.str = "None";
     for (i = 0; i < NUM_RESOLUTIONS; i++)
       if (caps->resolutions & pcl_resolutions[i].pcl_code)
 	{
-	  if (pcl_resolutions[i].pcl_code >= PCL_RES_300_300 &&
-	      description->deflt.str == NULL)
-	    description->deflt.str =
-	      pcl_val_to_string(pcl_resolutions[i].pcl_code,
-				pcl_resolutions, NUM_RESOLUTIONS);
 	  stp_string_list_add_string
 	    (description->bounds.str,
 	     pcl_val_to_string(pcl_resolutions[i].pcl_code,
@@ -1751,8 +1788,31 @@ pcl_parameters(const stp_vars_t *v, const char *name,
 	     pcl_val_to_text(pcl_resolutions[i].pcl_code,
 			     pcl_resolutions, NUM_RESOLUTIONS));
 	}
-    if (description->deflt.str == NULL)
-      stp_erprintf("No default resolution set!\n");
+  }
+  else if (strcmp(name, "Quality") == 0)
+  {
+    int has_standard_quality = 0;
+    description->bounds.str = stp_string_list_create();
+    stp_string_list_add_string(description->bounds.str, "None",
+			       _("Manual Control"));
+    for (i = 0; i < NUM_QUALITIES; i++)
+      if (caps->resolutions & pcl_qualities[i].pcl_code)
+	{
+	  const char *qual =
+	    pcl_val_to_string(pcl_qualities[i].pcl_code,
+			      pcl_qualities, NUM_QUALITIES);
+	  if (! stp_string_list_is_present(description->bounds.str, qual))
+	    stp_string_list_add_string
+	      (description->bounds.str, qual,
+	       pcl_val_to_text(pcl_qualities[i].pcl_code,
+			       pcl_qualities, NUM_QUALITIES));
+	  if (strcmp(qual, "Standard") == 0)
+	    has_standard_quality = 1;
+	}
+    if (has_standard_quality)
+      description->deflt.str = "Standard";
+    else
+      description->deflt.str = "None";
   }
   else if (strcmp(name, "InkType") == 0)
   {
@@ -1815,8 +1875,8 @@ pcl_parameters(const stp_vars_t *v, const char *name,
       else
 	description->is_active = 0;
     }
-  else if (strcmp(name, "LightCyanTransition") == 0 ||
-	   strcmp(name, "LightMagentaTransition") == 0)
+  else if (strcmp(name, "LightCyanTrans") == 0 ||
+	   strcmp(name, "LightMagentaTrans") == 0)
     {
       if (caps->color_type & PCL_COLOR_CMYKcm &&
 	  stp_check_string_parameter(v, "PrintingMode", STP_PARAMETER_DEFAULTED) &&
@@ -2100,11 +2160,9 @@ get_double_param(stp_vars_t *v, const char *param)
 static int
 pcl_do_print(stp_vars_t *v, stp_image_t *image)
 {
-  int i;
   pcl_privdata_t privdata;
   int		status = 1;
   int		model = stp_get_model_id(v);
-  const char	*resolution = stp_get_string_parameter(v, "Resolution");
   const char	*media_size = stp_get_string_parameter(v, "PageSize");
   const char	*media_type = stp_get_string_parameter(v, "MediaType");
   const char	*media_source = stp_get_string_parameter(v, "InputSlot");
@@ -2175,24 +2233,14 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
   * Figure out the output resolution...
   */
 
-  xdpi = 0;
-  ydpi = 0;
-  if (resolution)
-    {
-      for (i = 0; i < NUM_RESOLUTIONS; i++)
-	{
-	  if (!strcmp(resolution, pcl_resolutions[i].pcl_name))
-	    {
-	      xdpi = pcl_resolutions[i].p0;
-	      ydpi = pcl_resolutions[i].p1;
-	      break;
-	    }
-	}
-    }
+  pcl_describe_resolution(v, &xdpi, &ydpi);
 
   stp_deprintf(STP_DBG_PCL,"pcl: resolution=%dx%d\n",xdpi,ydpi);
-  if (xdpi == 0 || ydpi == 0)
-    return 0;
+  if (xdpi <= 0 || ydpi <= 0)
+    {
+      stp_eprintf(v, "No resolution found; cannot print.\n");
+      return 0;
+    }
 
  /*
   * Choose the correct color conversion function...
@@ -2498,13 +2546,12 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
     }
   }
 
-#ifndef PCL_DEBUG_DISABLE_COMPRESSION
-  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF)
+  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF &&
+      !(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
   {
     stp_puts("\033*b2M", v);			/* Mode 2 (TIFF) */
   }
   else
-#endif
   {
     stp_puts("\033*b0M", v);			/* Mode 0 (no compression) */
   }
@@ -2615,14 +2662,13 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
 
 /* Allocate buffer for pcl_mode2 tiff compression */
 
-#ifndef PCL_DEBUG_DISABLE_COMPRESSION
-  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF)
+  if ((caps->stp_printer_type & PCL_PRINTER_TIFF) == PCL_PRINTER_TIFF &&
+      !(stp_get_debug_level() & STP_DBG_NO_COMPRESSION))
   {
     privdata.comp_buf = stp_malloc((privdata.height + 128 + 7) * 129 / 128);
     privdata.writefunc = pcl_mode2;
   }
   else
-#endif
   {
     privdata.comp_buf = NULL;
     privdata.writefunc = pcl_mode0;
@@ -2722,12 +2768,12 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
   if (lcyan)
     stp_channel_set_density_adjustment
       (v, STP_ECOLOR_C, 1, (get_double_param(v, "CyanDensity") *
-			get_double_param(v, "LightCyanTransition") *
+			get_double_param(v, "LightCyanTrans") *
 			get_double_param(v, "Density")));
   if (lmagenta)
     stp_channel_set_density_adjustment
       (v, STP_ECOLOR_M, 1, (get_double_param(v, "MagentaDensity") *
-			get_double_param(v, "LightMagentaTransition") *
+			get_double_param(v, "LightMagentaTrans") *
 			get_double_param(v, "Density")));
 
 
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index c12bbc2..728718e 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.99 2007/12/24 03:05:52 rlk Exp $"
+ * "$Id: print-ps.c,v 1.101 2008/08/18 02:00:18 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -68,19 +68,25 @@ static const stp_parameter_t the_parameters[] =
     "PPDFile", N_("PPDFile"), N_("Basic Printer Setup"),
     N_("PPD File"),
     STP_PARAMETER_TYPE_FILE, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+  },
+  {
+    "PageSize", N_("Page Size"), N_("Basic Printer Setup"),
+    N_("Size of the paper being printed to"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "ModelName", N_("Model Name"), N_("Basic Printer Setup"),
     N_("PPD File Model Name"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, -1, 0, 0
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -182,6 +188,12 @@ ps_option_to_param(stp_parameter_t *param, stp_mxml_node_t *option)
  */
 
 static int
+ppd_whitespace_callback(stp_mxml_node_t *node, int where)
+{
+  return 0;
+}
+
+static int
 check_ppd_file(const stp_vars_t *v)
 {
   const char *ppd_file = stp_get_file_parameter(v, "PPDFile");
@@ -214,6 +226,12 @@ check_ppd_file(const stp_vars_t *v)
 	  stp_eprintf(v, "Unable to open PPD file %s\n", ppd_file);
 	  return 0;
 	}
+      if (stp_get_debug_level() & STP_DBG_PS)
+	{
+	  char *ppd_stuff = stp_mxmlSaveAllocString(m_ppd, ppd_whitespace_callback);
+	  stp_dprintf(STP_DBG_PS, v, "%s", ppd_stuff);
+	  stp_free(ppd_stuff);
+	}
 
       m_ppd_file = stp_strdup(ppd_file);
       return 1;
@@ -228,8 +246,8 @@ ps_list_parameters(const stp_vars_t *v)
   stp_mxml_node_t *option;
   int i;
   int status = check_ppd_file(v);
-  stp_dprintf(STP_DBG_PS, v, "Adding parameters from %s\n",
-	      m_ppd_file ? m_ppd_file : "(null)");
+  stp_dprintf(STP_DBG_PS, v, "Adding parameters from %s (%d)\n",
+	      m_ppd_file ? m_ppd_file : "(null)", status);
 
   for (i = 0; i < the_parameter_count; i++)
     stp_parameter_list_add_param(ret, &(the_parameters[i]));
@@ -237,6 +255,7 @@ ps_list_parameters(const stp_vars_t *v)
   if (status)
     {
       int num_options = stpi_xmlppd_find_option_count(m_ppd);
+      stp_dprintf(STP_DBG_PS, v, "Found %d parameters\n", num_options);
       for (i=0; i < num_options; i++)
 	{
 	  /* MEMORY LEAK!!! */
@@ -246,7 +265,8 @@ ps_list_parameters(const stp_vars_t *v)
 	    {
 	      ps_option_to_param(param, option);
 	      if (param->p_type != STP_PARAMETER_TYPE_INVALID &&
-		  strcmp(param->name, "PageRegion") != 0)
+		  strcmp(param->name, "PageRegion") != 0 &&
+		  strcmp(param->name, "PageSize") != 0)
 		{
 		  stp_dprintf(STP_DBG_PS, v, "Adding parameter %s %s\n",
 			      param->name, param->text);
@@ -288,17 +308,16 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
 	  description->is_active = 1;
 	else if (strcmp(name, "ModelName") == 0)
 	  {
+	    const char *nickname;
+	    description->bounds.str = stp_string_list_create();
 	    if (m_ppd && stp_mxmlElementGetAttr(m_ppd, "nickname"))
-	      {
-		const char *nickname = stp_mxmlElementGetAttr(m_ppd, "nickname");
-		description->bounds.str = stp_string_list_create();
-		stp_string_list_add_string(description->bounds.str,
-					   nickname, nickname);
-		description->deflt.str = nickname;
-		description->is_active = status;
-	      }
+	      nickname = stp_mxmlElementGetAttr(m_ppd, "nickname");
 	    else
-	      description->is_active = 0;
+	      nickname = _("None; please provide a PPD file");
+	    stp_string_list_add_string(description->bounds.str,
+				       nickname, nickname);
+	    description->deflt.str = nickname;
+	    description->is_active = 1;
 	    return;
 	  }
 	else if (strcmp(name, "PrintingMode") == 0)
@@ -321,20 +340,38 @@ ps_parameters_internal(const stp_vars_t *v, const char *name,
       }
   }
 
-  if (!status)
+  if (!status && strcmp(name, "PageSize") != 0)
     return;
   if ((option = stpi_xmlppd_find_option_named(m_ppd, name)) == NULL)
   {
-    char *tmp = stp_malloc(strlen(name) + 4);
-    strcpy(tmp, "Stp");
-    strncat(tmp, name, strlen(name) + 3);
-    if ((option = stpi_xmlppd_find_option_named(m_ppd, tmp)) == NULL)
+    if (strcmp(name, "PageSize") == 0)
       {
-	stp_dprintf(STP_DBG_PS, v, "no parameter %s", name);
-	stp_free(tmp);
+	/* Provide a default set of page sizes */
+	description->bounds.str = stp_string_list_create();
+	stp_string_list_add_string
+	  (description->bounds.str, "Letter", _("Letter"));
+	stp_string_list_add_string
+	  (description->bounds.str, "A4", _("A4"));
+	stp_string_list_add_string
+	  (description->bounds.str, "Custom", _("Custom"));
+	description->deflt.str =
+	  stp_string_list_param(description->bounds.str, 0)->name;
+	description->is_active = 1;
 	return;
       }
-    stp_free(tmp);
+    else
+      {
+	char *tmp = stp_malloc(strlen(name) + 4);
+	strcpy(tmp, "Stp");
+	strncat(tmp, name, strlen(name) + 3);
+	if ((option = stpi_xmlppd_find_option_named(m_ppd, tmp)) == NULL)
+	  {
+	    stp_dprintf(STP_DBG_PS, v, "no parameter %s", name);
+	    stp_free(tmp);
+	    return;
+	  }
+	stp_free(tmp);
+      }
   }
 
   ps_option_to_param(description, option);
diff --git a/src/main/print-raw.c b/src/main/print-raw.c
index c345ae1..5290390 100644
--- a/src/main/print-raw.c
+++ b/src/main/print-raw.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-raw.c,v 1.39 2007/08/27 00:44:12 rlk Exp $"
+ * "$Id: print-raw.c,v 1.41 2008/07/18 10:57:24 rlk Exp $"
  *
  *   Print plug-in RAW driver for the GIMP.
  *
@@ -80,13 +80,13 @@ static const stp_parameter_t the_parameters[] =
     "InkType", N_("Ink Type"), N_("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, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
     "PrintingMode", N_("Printing Mode"), N_("Core Parameter"),
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
 };
 
@@ -210,18 +210,21 @@ raw_print(const stp_vars_t *v, stp_image_t *image)
   int ink_channels = 1;
   int rotate_output = 0;
   const char *ink_type = stp_get_string_parameter(nv, "InkType");
+  stp_image_init(image);
 
   stp_prune_inactive_options(nv);
   if (!stp_verify(nv))
     {
       stp_eprintf(nv, _("Print options not verified; cannot print.\n"));
       stp_vars_destroy(nv);
+      stp_image_conclude(image);
       return 0;
     }
   if (width != stp_image_width(image) || height != stp_image_height(image))
     {
       stp_eprintf(nv, _("Image dimensions must match paper dimensions"));
       stp_vars_destroy(nv);
+      stp_image_conclude(image);
       return 0;
     }
   if (ink_type)
@@ -251,6 +254,7 @@ raw_print(const stp_vars_t *v, stp_image_t *image)
     {
       stp_eprintf(nv, "Internal error!  Output channels or input channels must be 1\n");
       stp_vars_destroy(nv);
+      stp_image_conclude(image);
       return 0;
     }
 
diff --git a/src/main/print-util.c b/src/main/print-util.c
index ad4e4b9..3ab6959 100644
--- a/src/main/print-util.c
+++ b/src/main/print-util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-util.c,v 1.115 2007/09/02 18:11:51 rlk Exp $"
+ * "$Id: print-util.c,v 1.116 2008/07/08 17:32:02 easysw Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -541,7 +541,7 @@ stp_strdup(const char *s)
 const char *
 stp_set_output_codeset(const char *codeset)
 {
-#ifdef ENABLE_NLS
+#if defined(ENABLE_NLS) && !defined(__APPLE__)
   return (const char *)(bind_textdomain_codeset(PACKAGE, codeset));
 #else
   return "US-ASCII";
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index ae0c8e4..368973b 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-vars.c,v 1.81 2008/03/05 14:08:35 rlk Exp $"
+ * "$Id: print-vars.c,v 1.89 2008/07/21 00:02:32 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -144,10 +144,10 @@ copy_to_raw(stp_raw_t *raw, const void *data, size_t bytes)
     {
       ndata = stp_malloc(bytes + 1);
       memcpy(ndata, data, bytes);
+      ndata[bytes] = '\0';
     }
   else
     bytes = 0;
-  ndata[bytes] = '\0';
   raw->data = (void *) ndata;
   raw->bytes = bytes;
 }
@@ -1197,25 +1197,70 @@ stp_scale_float_parameter(stp_vars_t *v, const char *parameter,
   stp_set_float_parameter(v, parameter, val * scale);
 }
 
-static int
-check_parameter_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
-			const char *parameter, stp_parameter_activity_t active)
+void
+stp_clear_parameter(stp_vars_t *v, const char *parameter, stp_parameter_type_t type)
 {
-  const stp_list_t *list = v->params[p_type];
-  const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  if (item &&
-      active <= ((const value_t *) stp_list_item_get_data(item))->active)
-    return 1;
-  else
-    return 0;
+  switch (type)
+    {
+    case STP_PARAMETER_TYPE_STRING_LIST:
+      stp_clear_string_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_FILE:
+      stp_clear_file_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_DOUBLE:
+      stp_clear_float_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_INT:
+      stp_clear_int_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_DIMENSION:
+      stp_clear_dimension_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_BOOLEAN:
+      stp_clear_boolean_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_CURVE:
+      stp_clear_curve_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_ARRAY:
+      stp_clear_array_parameter(v, parameter);
+      break;
+    case STP_PARAMETER_TYPE_RAW:
+      stp_clear_raw_parameter(v, parameter);
+      break;
+    default:
+      stp_eprintf(v, "Attempt to clear unknown type parameter!\n");
+    }
+}
+
+
+int
+stp_check_parameter(const stp_vars_t *v,
+		    const char *parameter,
+		    stp_parameter_activity_t active,
+		    stp_parameter_type_t p_type)
+{
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+      if (item &&
+	  active <= ((const value_t *) stp_list_item_get_data(item))->active)
+	return 1;
+      else
+	return 0;
+    }
+  return 0;
 }
 
 #define CHECK_FUNCTION(type, index)					\
 int									\
-stp_check_##type##_parameter(const stp_vars_t *v, const char *parameter,	\
+stp_check_##type##_parameter(const stp_vars_t *v, const char *parameter, \
 			     stp_parameter_activity_t active)		\
 {									\
-  return check_parameter_generic(v, index, parameter, active);		\
+  return stp_check_parameter(v, parameter, active, index);		\
 }
 
 CHECK_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1228,23 +1273,65 @@ CHECK_FUNCTION(curve, STP_PARAMETER_TYPE_CURVE)
 CHECK_FUNCTION(array, STP_PARAMETER_TYPE_ARRAY)
 CHECK_FUNCTION(raw, STP_PARAMETER_TYPE_RAW)
 
-static stp_parameter_activity_t
-get_parameter_active_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
-			     const char *parameter)
+stp_string_list_t *
+stp_list_parameters(const stp_vars_t *v, stp_parameter_type_t p_type)
 {
-  const stp_list_t *list = v->params[p_type];
-  const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  if (item)
-    return ((const value_t *) stp_list_item_get_data(item))->active;
-  else
-    return 0;
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      stp_string_list_t *answer = stp_string_list_create();
+      const stp_list_item_t *li = stp_list_get_start(list);
+      while (li)
+	{
+	  const value_t *val = (value_t *) stp_list_item_get_data(li);
+	  stp_string_list_add_string(answer, val->name, val->name);
+	  li = stp_list_item_next(li);
+	}
+      return answer;
+    }
+  return NULL;
 }
 
-#define GET_PARAMETER_ACTIVE_FUNCTION(type, index)			     \
-stp_parameter_activity_t						     \
+#define LIST_FUNCTION(type, index)			\
+stp_string_list_t *					\
+stp_list_##type##_parameters(const stp_vars_t *v)	\
+{							\
+  return stp_list_parameters(v, index);			\
+}
+
+LIST_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
+LIST_FUNCTION(file, STP_PARAMETER_TYPE_FILE)
+LIST_FUNCTION(float, STP_PARAMETER_TYPE_DOUBLE)
+LIST_FUNCTION(int, STP_PARAMETER_TYPE_INT)
+LIST_FUNCTION(dimension, STP_PARAMETER_TYPE_DIMENSION)
+LIST_FUNCTION(boolean, STP_PARAMETER_TYPE_BOOLEAN)
+LIST_FUNCTION(curve, STP_PARAMETER_TYPE_CURVE)
+LIST_FUNCTION(array, STP_PARAMETER_TYPE_ARRAY)
+LIST_FUNCTION(raw, STP_PARAMETER_TYPE_RAW)
+
+stp_parameter_activity_t
+stp_get_parameter_active(const stp_vars_t *v, const char *parameter,
+			 stp_parameter_type_t p_type)
+{
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+      if (item)
+	return ((const value_t *) stp_list_item_get_data(item))->active;
+      else
+	return 0;
+    }
+  return 0;
+}
+
+#define GET_PARAMETER_ACTIVE_FUNCTION(type, index)			\
+stp_parameter_activity_t						\
 stp_get_##type##_parameter_active(const stp_vars_t *v, const char *parameter) \
-{									     \
-  return get_parameter_active_generic(v, index, parameter);		     \
+{									\
+  return stp_get_parameter_active(v, parameter, index);			\
 }
 
 GET_PARAMETER_ACTIVE_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1257,27 +1344,32 @@ GET_PARAMETER_ACTIVE_FUNCTION(curve, STP_PARAMETER_TYPE_CURVE)
 GET_PARAMETER_ACTIVE_FUNCTION(array, STP_PARAMETER_TYPE_ARRAY)
 GET_PARAMETER_ACTIVE_FUNCTION(raw, STP_PARAMETER_TYPE_RAW)
 
-static void
-set_parameter_active_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
-			     const char *parameter,
-			     stp_parameter_activity_t active)
+void
+stp_set_parameter_active(stp_vars_t *v,
+			 const char *parameter,
+			 stp_parameter_activity_t active,
+			 stp_parameter_type_t p_type)
 {
-  const stp_list_t *list = v->params[p_type];
-  const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  if (item && (active == STP_PARAMETER_ACTIVE ||
-	       active == STP_PARAMETER_INACTIVE))
-    ((value_t *) stp_list_item_get_data(item))->active = active;
+  if (p_type >= STP_PARAMETER_TYPE_STRING_LIST &&
+      p_type < STP_PARAMETER_TYPE_INVALID)
+    {
+      const stp_list_t *list = v->params[p_type];
+      const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+      if (item && (active == STP_PARAMETER_ACTIVE ||
+		   active == STP_PARAMETER_INACTIVE))
+	((value_t *) stp_list_item_get_data(item))->active = active;
+    }
 }
 
-#define SET_PARAMETER_ACTIVE_FUNCTION(type, index)			      \
-void									      \
-stp_set_##type##_parameter_active(const stp_vars_t *v, const char *parameter, \
-				  stp_parameter_activity_t active)	      \
-{									      \
-  stp_deprintf(STP_DBG_VARS,						      \
-	       "stp_set_%s_parameter_active(0x%p, %s, %d)\n",		      \
-	       #type, (const void *) v, parameter, active);			      \
-  set_parameter_active_generic(v, index, parameter, active);		      \
+#define SET_PARAMETER_ACTIVE_FUNCTION(type, index)			\
+void									\
+stp_set_##type##_parameter_active(stp_vars_t *v, const char *parameter, \
+				  stp_parameter_activity_t active)	\
+{									\
+  stp_deprintf(STP_DBG_VARS,						\
+	       "stp_set_%s_parameter_active(0x%p, %s, %d)\n",		\
+	       #type, (const void *) v, parameter, active);		\
+  stp_set_parameter_active(v, parameter, active, index);		\
 }
 
 SET_PARAMETER_ACTIVE_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1305,9 +1397,19 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
       desc->verify_this_parameter = param->verify_this_parameter;
       desc->read_only = param->read_only;
       desc->name = param->name;
-      desc->text = _(param->text);
-      desc->category = _(param->category);
-      desc->help = _(param->help);
+      if (!(param->text))
+	{
+	  stp_erprintf("No text string for parameter %s!\n", desc->name);
+	  stp_abort();
+	}
+      desc->text = gettext(param->text);
+      if (!(param->category))
+	{
+	  stp_erprintf("No category string for parameter %s!\n", desc->name);
+	  stp_abort();
+	}
+      desc->category = gettext(param->category);
+      desc->help = param->help ? gettext(param->help) : NULL;
       return;
     }
 }
@@ -1609,3 +1711,375 @@ stp_parameter_list_append(stp_parameter_list_t list,
 	stp_list_item_create(ilist, NULL, param);
     }
 }
+
+static void
+fill_vars_from_xmltree(stp_mxml_node_t *prop, stp_mxml_node_t *root,
+		       stp_vars_t *v)
+{
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
+  while (prop)
+    {
+      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;
+	  const char *prop_name = prop->value.element.name;
+	  const char *p_type = stp_mxmlElementGetAttr(prop, "type");
+	  const char *p_name = stp_mxmlElementGetAttr(prop, "name");
+	  if (!strcmp(prop_name, "parameter") && (!p_type || !p_name))
+	    stp_erprintf("Bad property found!\n");
+	  else if (!strcmp(prop_name, "parameter"))
+	    {
+	      const char *active = stp_mxmlElementGetAttr(prop, "active");
+	      const char *cref = stp_mxmlElementGetAttr(prop, "ref");
+	      stp_mxml_node_t *cnode = child;
+	      stp_parameter_type_t type = STP_PARAMETER_TYPE_INVALID;
+	      if (cref && root)
+		{
+		  cnode = stp_mxmlFindElement(root, root, "namedParam",
+					      "name", cref,
+					      STP_MXML_DESCEND);
+		  if (!cnode || cnode->type != STP_MXML_ELEMENT ||
+		      !(cnode->child))
+		    {
+		      stp_erprintf("Found parameter name %s type %s ref %s but no target!\n",
+				   p_name, p_type, cref);
+		      stp_abort();
+		    }
+		  else
+		    stp_deprintf(STP_DBG_XML, "Found parameter ref %s\n", cref);
+		  cnode = cnode->child;
+		}
+	      if (strcmp(p_type, "float") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_float_parameter
+			(v, p_name, stp_xmlstrtod(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set float '%s' to '%s' (%f)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_float_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "integer") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_int_parameter
+			(v, p_name, (int) stp_xmlstrtol(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set int '%s' to '%s' (%d)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_int_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "dimension") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_dimension_parameter
+			(v, p_name, (int) stp_xmlstrtol(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set dimension '%s' to '%s' (%d)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_dimension_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "boolean") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_boolean_parameter
+			(v, p_name, (int) stp_xmlstrtol(cnode->value.text.string));
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set bool '%s' to '%s' (%d)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_boolean_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "string") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_string_parameter
+			(v, p_name, cnode->value.text.string);
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set string '%s' to '%s' (%s)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_string_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "file") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_set_file_parameter
+			(v, p_name, cnode->value.text.string);
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			stp_deprintf(STP_DBG_XML, "  Set file '%s' to '%s' (%s)\n",
+				     p_name, cnode->value.text.string,
+				     stp_get_file_parameter(v, p_name));
+		    }
+		}
+	      else if (strcmp(p_type, "raw") == 0)
+		{
+		  if (cnode->type == STP_MXML_TEXT)
+		    {
+		      stp_raw_t *raw = stp_xmlstrtoraw(cnode->value.text.string);
+		      if (raw)
+			{
+			  stp_set_raw_parameter(v, p_name, raw->data,raw->bytes);
+			  type = STP_PARAMETER_TYPE_DOUBLE;
+			  stp_deprintf(STP_DBG_XML, "  Set raw '%s' to '%s'\n",
+				       p_name, cnode->value.text.string);
+			  stp_free((void *) raw->data);
+			  stp_free(raw);
+			}
+		    }
+		}
+	      else if (strcmp(p_type, "curve") == 0)
+		{
+		  stp_curve_t *curve;
+		  while (cnode->type != STP_MXML_ELEMENT && cnode->next)
+		    cnode = cnode->next;
+		  if (!cnode)
+		    {
+		      stp_erprintf("Unable to find XML curve!\n");
+		      stp_abort();
+		    }
+		  curve = stp_curve_create_from_xmltree(cnode);
+		  if (curve)
+		    {
+		      stp_set_curve_parameter(v, p_name, curve);
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      if (stp_get_debug_level() & STP_DBG_XML)
+			{
+			  char *cv = stp_curve_write_string(curve);
+			  stp_deprintf(STP_DBG_XML, "  Set curve '%s' (%s)\n",
+				       p_name, cv);
+			  stp_free(cv);
+			}
+		      stp_curve_destroy(curve);
+		    }
+		  else
+		    {
+		      stp_erprintf("Unable to extract curve!\n");
+		      stp_abort();
+		    }
+		}
+	      else if (strcmp(p_type, "array") == 0)
+		{
+		  stp_array_t *array;
+		  while (cnode->type != STP_MXML_ELEMENT && cnode->next)
+		    cnode = cnode->next;
+		  if (!cnode)
+		    {
+		      stp_erprintf("Unable to find XML array!\n");
+		      stp_abort();
+		    }
+		  array = stp_array_create_from_xmltree(cnode);
+		  if (array)
+		    {
+		      type = STP_PARAMETER_TYPE_DOUBLE;
+		      stp_set_array_parameter(v, p_name, array);
+		      stp_deprintf(STP_DBG_XML, "  Set array '%s'\n", p_name);
+		      stp_array_destroy(array);
+		    }
+		  else
+		    {
+		      stp_erprintf("Unable to extract array!\n");
+		      stp_abort();
+		    }
+		}
+	      else
+		{
+		  stp_erprintf("Bad property %s type %s\n", p_name, p_type);
+		}
+	      if (active && type != STP_PARAMETER_TYPE_INVALID)
+		{
+		  if (strcmp(active, "active") == 0)
+		    stp_set_parameter_active(v, p_name, STP_PARAMETER_ACTIVE, type);
+		  else if (strcmp(active, "inactive") == 0)
+		    stp_set_parameter_active(v, p_name, STP_PARAMETER_INACTIVE, type);
+		  else if (strcmp(active, "default") == 0)
+		    stp_set_parameter_active(v, p_name, STP_PARAMETER_DEFAULTED, type);
+		}
+
+	    }
+	  else if (child->type == STP_MXML_TEXT)
+	    {
+	      if (!strcmp(prop_name, "driver"))
+		stp_set_driver(v, child->value.text.string);
+	      else if (!strcmp(prop_name, "color_conversion"))
+		stp_set_color_conversion(v, child->value.text.string);
+	      else if (!strcmp(prop_name, "left"))
+		stp_set_left(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "top"))
+		stp_set_top(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "width"))
+		stp_set_width(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "height"))
+		stp_set_height(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "page_width"))
+		stp_set_page_width(v, stp_xmlstrtol(child->value.text.string));
+	      else if (!strcmp(prop_name, "page_height"))
+		stp_set_page_height(v, stp_xmlstrtol(child->value.text.string));
+	    }
+	}
+      prop = prop->next;
+    }
+#ifdef HAVE_LOCALE_H
+  setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
+}
+
+void
+stp_vars_fill_from_xmltree(stp_mxml_node_t *prop, stp_vars_t *v)
+{
+  fill_vars_from_xmltree(prop, NULL, v);
+}
+
+stp_vars_t *
+stp_vars_create_from_xmltree(stp_mxml_node_t *da)
+{
+  stp_vars_t *v = stp_vars_create();
+  fill_vars_from_xmltree(da, NULL, v);
+  return v;
+}
+
+void
+stp_vars_fill_from_xmltree_ref(stp_mxml_node_t *prop, stp_mxml_node_t *root,
+			       stp_vars_t *v)
+{
+  fill_vars_from_xmltree(prop, root, v);
+}
+
+stp_vars_t *
+stp_vars_create_from_xmltree_ref(stp_mxml_node_t *da, stp_mxml_node_t *root)
+{
+  stp_vars_t *v = stp_vars_create();
+  fill_vars_from_xmltree(da, root, v);
+  return v;
+}
+
+static void
+add_text_node(stp_mxml_node_t *node, const char *element, const char *value)
+{
+  if (value)
+    stp_mxmlNewOpaque(stp_mxmlNewElement(node, element), value);
+}
+
+stp_mxml_node_t *
+stp_xmltree_create_from_vars(const stp_vars_t *v)
+{
+  stp_mxml_node_t *varnode;
+  int i;
+  if (!v)
+    return NULL;
+  varnode = stp_mxmlNewElement(NULL, "vars");
+  add_text_node(varnode, "driver", stp_get_driver(v));
+  add_text_node(varnode, "color_conversion", stp_get_color_conversion(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "left"), stp_get_left(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "top"), stp_get_top(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "width"), stp_get_width(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "height"), stp_get_height(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "page_width"), stp_get_page_width(v));
+  stp_mxmlNewInteger(stp_mxmlNewElement(varnode, "page_height"), stp_get_page_height(v));
+  for (i = STP_PARAMETER_TYPE_STRING_LIST; i < STP_PARAMETER_TYPE_INVALID; i++)
+    {
+      stp_string_list_t *list = stp_list_parameters(v, i);
+      if (list)
+	{
+	  int j;
+	  int count = stp_string_list_count(list);
+	  for (j = 0; j < count; j++)
+	    {
+	      const stp_param_string_t *pstr = stp_string_list_param(list, j);
+	      const char *name = pstr->name;
+	      char *data;
+	      stp_mxml_node_t *node = stp_mxmlNewElement(varnode, "parameter");
+	      stp_parameter_activity_t active =
+		stp_get_parameter_active(v, name, i);
+	      stp_mxmlElementSetAttr(node, "name", name);
+	      stp_mxmlElementSetAttr(node, "active",
+				     (active == STP_PARAMETER_INACTIVE ?
+				      "inactive" :
+				      (active == STP_PARAMETER_DEFAULTED ?
+				       "default" : "active")));
+	      switch (i)
+		{
+		case STP_PARAMETER_TYPE_STRING_LIST:
+		  stp_mxmlElementSetAttr(node, "type", "string");
+		  data = stp_strtoxmlstr(stp_get_string_parameter(v, name));
+		  if (data)
+		    {
+		      stp_mxmlNewOpaque(node, data);
+		      stp_free(data);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_INT:
+		  stp_mxmlElementSetAttr(node, "type", "integer");
+		  stp_mxmlNewInteger(node, stp_get_int_parameter(v, name));
+		  break;
+		case STP_PARAMETER_TYPE_BOOLEAN:
+		  stp_mxmlElementSetAttr(node, "type", "boolean");
+		  stp_mxmlNewInteger(node, stp_get_boolean_parameter(v, name));
+		  break;
+		case STP_PARAMETER_TYPE_DOUBLE:
+		  stp_mxmlElementSetAttr(node, "type", "float");
+		  stp_mxmlNewReal(node, stp_get_float_parameter(v, name));
+		  break;
+		case STP_PARAMETER_TYPE_CURVE:
+		  stp_mxmlElementSetAttr(node, "type", "curve");
+		  stp_mxmlAdd(node, STP_MXML_ADD_AFTER, NULL,
+			      stp_xmltree_create_from_curve(stp_get_curve_parameter(v, name)));
+		  break;
+		case STP_PARAMETER_TYPE_FILE:
+		  stp_mxmlElementSetAttr(node, "type", "file");
+		  data = stp_strtoxmlstr(stp_get_file_parameter(v, name));
+		  if (data)
+		    {
+		      stp_mxmlNewOpaque(node, data);
+		      stp_free(data);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_RAW:
+		  stp_mxmlElementSetAttr(node, "type", "raw");
+		  data = stp_rawtoxmlstr(stp_get_raw_parameter(v, name));
+		  if (data)
+		    {
+		      stp_mxmlNewOpaque(node, data);
+		      stp_free(data);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_ARRAY:
+		  stp_mxmlElementSetAttr(node, "type", "array");
+		  stp_mxmlAdd(node, STP_MXML_ADD_AFTER, NULL,
+			      stp_xmltree_create_from_array(stp_get_array_parameter(v, name)));
+		  break;
+		case STP_PARAMETER_TYPE_DIMENSION:
+		  stp_mxmlElementSetAttr(node, "type", "dimension");
+		  stp_mxmlNewInteger(node, stp_get_dimension_parameter(v, name));
+		  break;
+		default:
+		  stp_mxmlElementSetAttr(node, "type", "INVALID!");
+		  break;
+		}
+	    }
+	  stp_string_list_destroy(list);
+	}
+    }
+  return varnode;
+}
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index ce79ee4..d77e302 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.68 2007/12/26 18:16:25 rlk Exp $"
+ * "$Id: print-weave.c,v 1.71 2008/07/14 02:07:30 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -368,31 +368,45 @@ typedef struct cooked {
 	int *stagger_postmap;
 } cooked_t;
 
+typedef struct startmap {
+  int startrow;
+  int map;
+  int pos;			/* Secondary key for stable sort */
+} startmap_t;
+
+static int
+smap_compare(const void *p1, const void *p2)
+{
+  const startmap_t *s1 = (const startmap_t *)p1;
+  const startmap_t *s2 = (const startmap_t *)p2;
+  if (s1->startrow < s2->startrow)
+    return -1;
+  else if (s1->startrow > s2->startrow)
+    return 1;
+  else if (s1->pos < s2->pos)
+    return -1;
+  else
+    return 1;
+}
+
 static void
 sort_by_start_row(int *map, int *startrows, int count)
 {
-	/*
-	 * Yes, it's a bubble sort, but we do it no more than 4 times
-	 * per page, and we are only sorting a small number of items.
-	 */
-
-	int dirty;
-
-	do {
-		int x;
-		dirty = 0;
-		for (x = 1; x < count; x++) {
-			if (startrows[x - 1] > startrows[x]) {
-				int temp = startrows[x - 1];
-				startrows[x - 1] = startrows[x];
-				startrows[x] = temp;
-				temp = map[x - 1];
-				map[x - 1] = map[x];
-				map[x] = temp;
-				dirty = 1;
-			}
-		}
-	} while (dirty);
+  startmap_t *smap = stp_malloc(sizeof(startmap_t) * count);
+  int i;
+  for (i = 0; i < count; i++)
+    {
+      smap[i].startrow = startrows[i];
+      smap[i].map = map[i];
+      smap[i].pos = i;
+    }
+  qsort(smap, count, sizeof(startmap_t), smap_compare);
+  for (i = 0; i < count; i++)
+    {
+      startrows[i] = smap[i].startrow;
+      map[i] = smap[i].map;
+    }
+  stp_free(smap);
 }
 
 static void
@@ -1155,10 +1169,10 @@ stp_initialize_weave(stp_vars_t *v,
 	      sw->ncolors, sw->bitwidth, linewidth, sw->horizontal_width,
 	      sw->vertical_height, first_line, last_line, maxHeadOffset);
   stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
-	      "      oversample %d line buffer count %d total buffer %d\n",
+	      "      oversample %d line buffer count %d total buffer %d, page_height %d\n",
 	      sw->oversample, sw->vmod,
 	      sw->vmod * sw->virtual_jets * sw->bitwidth *
-	      sw->ncolors * sw->horizontal_width);
+	      sw->ncolors * sw->horizontal_width, page_height);
   stp_allocate_component_data(v, "Weave", NULL, stpi_destroy_weave, sw);
   return;
 }
@@ -1200,12 +1214,17 @@ weave_parameters_by_row(const stp_vars_t *v, stpi_softweave_t *sw,
 	      w->physpassend, w->missingstartrows);
 }
 
+static stpi_softweave_t *
+get_sw(const stp_vars_t *v)
+{
+  return (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+}
+
 void
 stp_weave_parameters_by_row(const stp_vars_t *v, int row,
 			    int vertical_subpass, stp_weave_t *w)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   weave_parameters_by_row(v, sw, row, vertical_subpass, w);
 }
 
@@ -1267,40 +1286,35 @@ stpi_get_pass_by_row(stp_vars_t *v, stpi_softweave_t *sw,
 stp_lineoff_t *
 stp_get_lineoffsets_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->lineoffsets[pass % sw->vmod]);
 }
 
 stp_lineactive_t *
 stp_get_lineactive_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->lineactive[pass % sw->vmod]);
 }
 
 stp_linecount_t *
 stp_get_linecount_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->linecounts[pass % sw->vmod]);
 }
 
 const stp_linebufs_t *
 stp_get_linebases_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->linebases[pass % sw->vmod]);
 }
 
 stp_pass_t *
 stp_get_pass_by_pass(const stp_vars_t *v, int pass)
 {
-  const stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  const stpi_softweave_t *sw = get_sw(v);
   return &(sw->passes[pass % sw->vmod]);
 }
 
@@ -1310,8 +1324,8 @@ check_linebases(stp_vars_t *v, stpi_softweave_t *sw,
 {
   stp_linebufs_t *bufs =
     (stp_linebufs_t *) stpi_get_linebases(v, sw, row, cpass, head_offset);
-  if (!(bufs[0].v[color]))
-    bufs[0].v[color] =
+  if (!(bufs->v[color]))
+    bufs->v[color] =
       stp_zalloc (sw->virtual_jets * sw->bitwidth * sw->horizontal_width);
 }
 
@@ -1329,8 +1343,7 @@ void
 stp_fill_tiff(stp_vars_t *v, int row, int subpass,
 	      int width, int missingstartrows, int color)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   stp_lineoff_t *lineoffs;
   stp_linecount_t *linecount;
   const stp_linebufs_t *bufs;
@@ -1348,37 +1361,36 @@ stp_fill_tiff(stp_vars_t *v, int row, int subpass,
 
       while (l < full_blocks)
 	{
-	  (bufs[0].v[color][2 * i]) = 129;
-	  (bufs[0].v[color][2 * i + 1]) = 0;
+	  (bufs->v[color][2 * i]) = 129;
+	  (bufs->v[color][2 * i + 1]) = 0;
 	  i++;
 	  l++;
 	}
       if (leftover == 1)
 	{
-	  (bufs[0].v[color][2 * i]) = 1;
-	  (bufs[0].v[color][2 * i + 1]) = 0;
+	  (bufs->v[color][2 * i]) = 1;
+	  (bufs->v[color][2 * i + 1]) = 0;
 	  i++;
 	}
       else if (leftover > 0)
 	{
-	  (bufs[0].v[color][2 * i]) = 257 - leftover;
-	  (bufs[0].v[color][2 * i + 1]) = 0;
+	  (bufs->v[color][2 * i]) = 257 - leftover;
+	  (bufs->v[color][2 * i + 1]) = 0;
 	  i++;
 	}
     }
 
   lineoffs = stpi_get_lineoffsets(v, sw, row, subpass, sw->head_offset[color]);
   linecount = stpi_get_linecount(v, sw, row, subpass, sw->head_offset[color]);
-  lineoffs[0].v[color] = 2 * i;
-  linecount[0].v[color] = missingstartrows;
+  lineoffs->v[color] = 2 * i;
+  linecount->v[color] = missingstartrows;
 }
 
 void
 stp_fill_uncompressed(stp_vars_t *v, int row, int subpass,
 		      int width, int missingstartrows, int color)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   stp_lineoff_t *lineoffs;
   stp_linecount_t *linecount;
   const stp_linebufs_t *bufs;
@@ -1387,9 +1399,9 @@ stp_fill_uncompressed(stp_vars_t *v, int row, int subpass,
   lineoffs = stpi_get_lineoffsets(v, sw, row, subpass, sw->head_offset[color]);
   linecount = stpi_get_linecount(v, sw, row, subpass, sw->head_offset[color]);
   width *= sw->bitwidth * missingstartrows;
-  memset(bufs[0].v[color], 0, width);
-  lineoffs[0].v[color] = width;
-  linecount[0].v[color] = missingstartrows;
+  memset(bufs->v[color], 0, width);
+  lineoffs->v[color] = width;
+  linecount->v[color] = missingstartrows;
 }
 
 int
@@ -1446,23 +1458,23 @@ initialize_row(stp_vars_t *v, stpi_softweave_t *sw,
 
 		  for(jj=0; jj<sw->ncolors; jj++)
 		    {
-		      if (lineoffs[0].v[jj] != 0)
+		      if (lineoffs->v[jj] != 0)
 			stp_eprintf(v, "WARNING: pass %d subpass %d row %d: "
 				    "lineoffs %ld should be zero!\n",
-				    w.pass, i, row, lineoffs[0].v[jj]);
-		      lineoffs[0].v[jj] = 0;
-		      lineactive[0].v[jj] = 0;
-		      if (linecount[0].v[jj] != 0)
+				    w.pass, i, row, lineoffs->v[jj]);
+		      lineoffs->v[jj] = 0;
+		      lineactive->v[jj] = 0;
+		      if (linecount->v[jj] != 0)
 			stp_eprintf(v, "WARNING: pass %d subpass %d row %d: "
 				    "linecount %d should be zero!\n",
-				    w.pass, i, row, linecount[0].v[jj]);
-		      linecount[0].v[jj] = 0;
-		      linebounds[0].start_pos[jj] = INT_MAX;
-		      linebounds[0].end_pos[jj] = -1;
+				    w.pass, i, row, linecount->v[jj]);
+		      linecount->v[jj] = 0;
+		      linebounds->start_pos[jj] = INT_MAX;
+		      linebounds->end_pos[jj] = -1;
 		    }
 		}
 
-	      if((linecount[0].v[j] == 0) && (w.jet > 0))
+	      if((linecount->v[j] == 0) && (w.jet > 0))
 		{
 		  (sw->fillfunc)(v, row, i, width, w.jet, j);
 		}
@@ -1483,8 +1495,8 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
     stpi_get_lineactive(v, sw, sw->lineno, h_pass, sw->head_offset[color]);
   stp_linecount_t *linecount =
     stpi_get_linecount(v, sw, sw->lineno, h_pass, sw->head_offset[color]);
-  size_t place = lineoffs[0].v[color];
-  size_t count = linecount[0].v[color];
+  size_t place = lineoffs->v[color];
+  size_t count = linecount->v[color];
   if (place + nbytes > sw->virtual_jets * sw->bitwidth * sw->horizontal_width)
     {
       stp_eprintf(v, "Buffer overflow: limit %d, actual %d, count %d\n",
@@ -1492,17 +1504,16 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
 		  place + nbytes, count);
       stp_abort();
     }
-  memcpy(bufs[0].v[color] + lineoffs[0].v[color], buf, nbytes);
-  lineoffs[0].v[color] += nbytes;
+  memcpy(bufs->v[color] + lineoffs->v[color], buf, nbytes);
+  lineoffs->v[color] += nbytes;
   if (setactive)
-    lineactive[0].v[color] = 1;
+    lineactive->v[color] = 1;
 }
 
 static void
 stpi_flush_passes(stp_vars_t *v, int flushall)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   while (1)
     {
       stp_pass_t *pass = stp_get_pass_by_pass(v, sw->last_pass + 1);
@@ -1527,8 +1538,7 @@ stp_flush_all(stp_vars_t *v)
 static void
 finalize_row(stp_vars_t *v, int row)
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  stpi_softweave_t *sw = get_sw(v);
   int i,j;
   stp_dprintf(STP_DBG_ROWS, v, "Finalizing row %d...\n", row);
   for (i = 0; i < sw->oversample; i++)
@@ -1539,7 +1549,7 @@ finalize_row(stp_vars_t *v, int row)
       for(j=0; j<sw->ncolors; j++)
         {
 	  lines = stpi_get_linecount(v, sw, row, i, sw->head_offset[j]);
-	  lines[0].v[j]++;
+	  lines->v[j]++;
         }
 
       weave_parameters_by_row(v, sw, row, i, &w);
@@ -1556,8 +1566,7 @@ finalize_row(stp_vars_t *v, int row)
 void
 stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
 {
-  stpi_softweave_t *sw =
-    (stpi_softweave_t *) stp_get_component_data(v, "Weave");
+  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];
@@ -1576,7 +1585,7 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
     sw->fold_buf = stp_zalloc(sw->bitwidth * ylength);
   if (!sw->comp_buf)
     sw->comp_buf = stp_zalloc(sw->bitwidth *
-			       (sw->compute_linewidth)(v,ylength));
+			      (sw->compute_linewidth)(v,ylength));
   if (sw->current_vertical_subpass == 0)
     initialize_row(v, sw, sw->lineno, xlength, cols);
 
diff --git a/src/main/printers.c b/src/main/printers.c
index 4cb0bc8..8df5ea9 100644
--- a/src/main/printers.c
+++ b/src/main/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.83 2008/01/21 23:34:25 rlk Exp $"
+ * "$Id: printers.c,v 1.85 2008/06/03 11:40:39 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -288,7 +288,7 @@ stp_printer_describe_parameter(const stp_vars_t *v, const char *name,
 }
 
 static void
-set_printer_defaults(stp_vars_t *v, int core_only)
+set_printer_defaults(stp_vars_t *v, int core_only, int soft)
 {
   stp_parameter_list_t *params;
   int count;
@@ -306,32 +306,60 @@ set_printer_defaults(stp_vars_t *v, int core_only)
 	  switch (p->p_type)
 	    {
 	    case STP_PARAMETER_TYPE_STRING_LIST:
-	      stp_set_string_parameter(v, p->name, desc.deflt.str);
-	      stp_set_string_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_string_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_string_parameter(v, p->name, desc.deflt.str);
+		  stp_set_string_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_DOUBLE:
-	      stp_set_float_parameter(v, p->name, desc.deflt.dbl);
-	      stp_set_float_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_float_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_float_parameter(v, p->name, desc.deflt.dbl);
+		  stp_set_float_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_INT:
-	      stp_set_int_parameter(v, p->name, desc.deflt.integer);
-	      stp_set_int_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_int_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_int_parameter(v, p->name, desc.deflt.integer);
+		  stp_set_int_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_DIMENSION:
-	      stp_set_dimension_parameter(v, p->name, desc.deflt.dimension);
-	      stp_set_dimension_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_dimension_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_dimension_parameter(v, p->name, desc.deflt.dimension);
+		  stp_set_dimension_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_BOOLEAN:
-	      stp_set_boolean_parameter(v, p->name, desc.deflt.boolean);
-	      stp_set_boolean_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_boolean_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_boolean_parameter(v, p->name, desc.deflt.boolean);
+		  stp_set_boolean_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_CURVE:
-	      stp_set_curve_parameter(v, p->name, desc.deflt.curve);
-	      stp_set_curve_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_curve_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_curve_parameter(v, p->name, desc.deflt.curve);
+		  stp_set_curve_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    case STP_PARAMETER_TYPE_ARRAY:
-	      stp_set_array_parameter(v, p->name, desc.deflt.array);
-	      stp_set_array_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+	      if (!soft ||
+		  !stp_check_array_parameter(v, p->name, STP_PARAMETER_DEFAULTED))
+		{
+		  stp_set_array_parameter(v, p->name, desc.deflt.array);
+		  stp_set_array_parameter_active(v, p->name, STP_PARAMETER_ACTIVE);
+		}
 	      break;
 	    default:
 	      break;
@@ -346,7 +374,14 @@ void
 stp_set_printer_defaults(stp_vars_t *v, const stp_printer_t *printer)
 {
   stp_set_driver(v, stp_printer_get_driver(printer));
-  set_printer_defaults(v, 0);
+  set_printer_defaults(v, 0, 0);
+}
+
+void
+stp_set_printer_defaults_soft(stp_vars_t *v, const stp_printer_t *printer)
+{
+  stp_set_driver(v, stp_printer_get_driver(printer));
+  set_printer_defaults(v, 0, 1);
 }
 
 void
@@ -368,7 +403,7 @@ stp_printer_get_defaults(const stp_printer_t *printer)
     {
       stp_printer_t *nc_printer = (stp_printer_t *) printer;
       stp_deprintf(STP_DBG_PRINTERS, "  ==>init %s\n", printer->driver);
-      set_printer_defaults (nc_printer->printvars, 1);
+      set_printer_defaults (nc_printer->printvars, 1, 0);
       nc_printer->vars_initialized = 1;
     }
   return printer->printvars;
@@ -939,105 +974,6 @@ stp_family_unregister(stp_list_t *family)
   return 0;
 }
 
-static void
-stp_fill_printvars_from_xmltree(stp_mxml_node_t *prop,
-				stp_vars_t *v)
-{
-  while (prop)
-    {
-      if (prop->type == STP_MXML_ELEMENT)
-	{
-	  const char *prop_name = prop->value.element.name;
-	  if (!strcmp(prop_name, "parameter"))
-	    {
-	      const char *p_type = stp_mxmlElementGetAttr(prop, "type");
-	      const char *p_name = stp_mxmlElementGetAttr(prop, "name");
-	      stp_mxml_node_t *child = prop->child;
-	      if (!p_type || !p_name)
-		stp_erprintf("Bad property found!\n");
-	      else if (strcmp(p_type, "float") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_float_parameter
-			(v, p_name, stp_xmlstrtod(child->value.text.string));
-		      stp_deprintf(STP_DBG_XML, "  Set float '%s' to '%s' (%f)\n",
-				   p_name, child->value.text.string,
-				   stp_get_float_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "integer") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_int_parameter
-			(v, p_name, (int) stp_xmlstrtol(child->value.text.string));
-		      stp_deprintf(STP_DBG_XML, "  Set int '%s' to '%s' (%d)\n",
-				   p_name, child->value.text.string,
-				   stp_get_int_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "boolean") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_boolean_parameter
-			(v, p_name, (int) stp_xmlstrtol(child->value.text.string));
-		      stp_deprintf(STP_DBG_XML, "  Set bool '%s' to '%s' (%d)\n",
-				   p_name, child->value.text.string,
-				   stp_get_boolean_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "string") == 0)
-		{
-		  if (child->type == STP_MXML_TEXT)
-		    {
-		      stp_set_string_parameter
-			(v, p_name, child->value.text.string);
-		      stp_deprintf(STP_DBG_XML, "  Set string '%s' to '%s' (%s)\n",
-				   p_name, child->value.text.string,
-				   stp_get_string_parameter(v, p_name));
-		    }
-		}
-	      else if (strcmp(p_type, "curve") == 0)
-		{
-		  stp_curve_t *curve;
-		  while (child->type == STP_MXML_TEXT && child->next)
-		    child = child->next;
-		  curve = stp_curve_create_from_xmltree(child);
-		  if (curve)
-		    {
-		      stp_set_curve_parameter(v, p_name, curve);
-		      stp_deprintf(STP_DBG_XML, "  Set curve '%s' to '%s' (%s)\n",
-				   p_name, child->value.text.string,
-				   stp_curve_write_string(curve));
-		      stp_curve_destroy(curve);
-		    }
-		}
-	      else if (strcmp(p_type, "array") == 0)
-		{
-		  stp_array_t *array;
-		  while (child->type == STP_MXML_TEXT && child->next)
-		    child = child->next;
-		  array = stp_array_create_from_xmltree(child);
-		  if (array)
-		    {
-		      stp_set_array_parameter(v, p_name, array);
-		      stp_deprintf(STP_DBG_XML, "  Set array '%s' to '%s'\n",
-				   p_name, child->value.text.string);
-		      stp_array_destroy(array);
-		    }
-		}
-	      else
-		{
-		  stp_erprintf("Bad property %s type %s\n", p_name, p_type);
-		}
-	    }
-	}
-      prop = prop->next;
-    }
-} 
-
 static stp_printvars_t *
 stp_printvars_create_from_xmltree(stp_mxml_node_t *printer,
 				  const char *family)
@@ -1070,7 +1006,7 @@ stp_printvars_create_from_xmltree(stp_mxml_node_t *printer,
   prop = printer->child;
   stp_deprintf(STP_DBG_XML, ">>stp_printvars_create_from_xmltree: %p, %s\n",
 	       (void *) (outprintvars->printvars), outprintvars->name);
-  stp_fill_printvars_from_xmltree(prop, outprintvars->printvars);
+  stp_vars_fill_from_xmltree(prop, outprintvars->printvars);
   stp_deprintf(STP_DBG_XML, "<<stp_printvars_create_from_xmltree: %p, %s\n",
 	       (void *) (outprintvars->printvars), outprintvars->name);
   return outprintvars;
@@ -1127,7 +1063,7 @@ stp_printer_create_from_xmltree(stp_mxml_node_t *printer, /* The printer node */
   outprinter->printfuncs = printfuncs;
 
   prop = printer->child;
-  stp_fill_printvars_from_xmltree(prop, outprinter->printvars);
+  stp_vars_fill_from_xmltree(prop, outprinter->printvars);
   if (driver && long_name && printfuncs)
     {
       if (stp_get_debug_level() & STP_DBG_XML)
diff --git a/src/main/printers.xml b/src/main/printers.xml
deleted file mode 100644
index e815c23..0000000
--- a/src/main/printers.xml
+++ /dev/null
@@ -1,998 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-   XML description of printers known to libgutenprint
-   This file was originally generated.  It should be edited by hand.
-
-   "$Id: printers.xml,v 1.227 2008/04/26 01:15:12 rlk Exp $"
--->
-
-<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">
-  <printdef>
-    <family name="ps">
-      <printer name="PostScript Level 1" driver="ps" manufacturer="Adobe" model="0" />
-      <printer name="PostScript Level 2" driver="ps2" manufacturer="Adobe" model="1" />
-    </family>
-    <family name="canon">
-      <parameters name="density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-      </parameters>
-      <parameters name="gamma_5_density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-      </parameters>
-      <parameters name="gamma_6_density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-        <parameter type="float" name="Gamma">0.6</parameter>
-      </parameters>
-      <parameters name="gamma_8_density_900_params">
-        <parameter type="float" name="Density">0.9</parameter>
-        <parameter type="float" name="Gamma">0.8</parameter>
-      </parameters>
-      <parameters name="gamma_2_density_800_params">
-        <parameter type="float" name="Density">0.8</parameter>
-        <parameter type="float" name="Gamma">2.0</parameter>
-      </parameters>
-      <parameters name="gamma_750_params">
-        <parameter type="float" name="Gamma">0.75</parameter>
-      </parameters>
-      <parameters name="PIXMA_iP4000_params">
-        <parameter type="float" name="Gamma">0.60</parameter>
-      </parameters>
-      <parameters name="PIXMA_iP4200_params">
-        <parameter type="float" name="Brightness">1.30</parameter>
-        <parameter type="float" name="Gamma">0.70</parameter>
-        <parameter type="float" name="Density">0.80</parameter>
-      </parameters>
-      <parameters name="PIXMA_iP4300_params">
-        <parameter type="float" name="Brightness">0.7</parameter>
-        <parameter type="float" name="Density">0.6</parameter>
-        <parameter type="float" name="Contrast">1.7</parameter>
-        <parameter type="float" name="Gamma">0.9</parameter>
-        <parameter type="float" name="BlackGamma">0.6</parameter>
-      </parameters>
-      <parameters name="PIXMA_iX5000_params"> 
-        <parameter type="float" name="BlackGamma">2.0</parameter> 
-        <parameter type="float" name="YellowGamma">1.4</parameter> 
-        <parameter type="float" name="MagentaGamma">1.3</parameter> 
-        <parameter type="float" name="CyanGamma">1.3</parameter> 
-      </parameters>
-      <printer name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
-      <printer name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
-      <printer name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
-      <printer name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
-      <printer name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
-      <printer name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
-      <printer name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
-      <printer name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
-      <printer name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
-      <printer name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
-      <printer name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
-      <printer name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
-      <printer name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
-      <printer name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
-      <printer name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
-      <printer name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
-      <printer name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
-      <printer name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" parameters="density_800_params" />
-      <printer name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
-      <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
-      <printer name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" />
-      <printer name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
-      <printer name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
-      <printer name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
-      <printer name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
-      <printer name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
-      <printer name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" />
-      <printer name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" />
-      <printer name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" />
-      <printer name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP6000D" driver="bjc-PIXMA-iP6000D" manufacturer="Canon" model="3006000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" />
-      <printer name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP520" driver="bjc-MULTIPASS-MP520" manufacturer="Canon" model="5000520" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000740" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" />
-      <printer name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" />
-      <printer name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-      <printer name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
-    </family>
-    <family name="escp2">
-      <parameters name="standard_params">
-        <parameter type="float" name="Gamma">0.470</parameter>
-      </parameters>
-      <parameters name="480_params">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="YellowGamma">0.9</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-      </parameters>
-      <parameters name="pro_5500_params">
-        <parameter type="float" name="CyanGamma">0.8</parameter>
-        <parameter type="float" name="Gamma">0.470</parameter>
-      </parameters>
-      <parameters name="cx3500_params">
-        <parameter type="float" name="CyanGamma">0.96</parameter>
-        <parameter type="float" name="MagentaGamma">1.02</parameter>
-        <parameter type="float" name="YellowGamma">1.02</parameter>
-        <parameter type="float" name="Gamma">0.500</parameter>
-      </parameters>
-      <parameters name="claria_params">
-        <parameter type="float" name="Gamma">0.470</parameter>
-        <parameter type="float" name="BlackDensity">0.8</parameter>
-      </parameters>
-      <printer name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
-      <printer name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
-      <printer name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
-      <printer name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
-      <printer name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
-      <printer name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
-      <printer name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color I" driver="escp2-i" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color II" driver="escp2-ii" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color IIs" driver="escp2-iis" manufacturer="Epson" model="0" parameters="standard_params" />
-      <printer name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
-      <printer name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
-      <printer name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
-      <printer name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
-      <printer name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
-      <printer name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
-      <printer name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
-      <printer name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
-      <printer name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
-      <printer name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
-      <printer name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
-      <printer name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
-      <printer name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
-      <printer name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
-      <printer name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
-      <printer name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
-      <printer name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
-      <printer name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
-      <printer name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
-      <printer name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
-      <printer name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
-      <printer name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
-      <printer name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
-      <printer name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
-      <printer name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
-    <!--
-         Note that the 785EPX has a roll feed holder.  It's more like the 890
-         than the 780, despite the name.
-    -->
-      <printer name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
-      <printer name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
-      <printer name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R265" driver="escp2-r265" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R270" driver="escp2-r270" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R280" driver="escp2-r280" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R285" driver="escp2-r285" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo R390" driver="escp2-r390" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX585" driver="escp2-rx585" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX590" driver="escp2-rx590" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX595" driver="escp2-rx595" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
-      <printer name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 7500" driver="escp2-7500" manufacturer="Epson" model="29" parameters="pro_5500_params" />
-      <printer name="Epson Stylus Pro 7600" driver="escp2-7600" manufacturer="Epson" model="48" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31" parameters="pro_5500_params" />
-      <printer name="Epson Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49" parameters="standard_params" />
-      <printer name="Epson Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41" parameters="standard_params" />
-      <printer name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
-      <printer name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
-      <printer name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="80" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
-      <printer name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
-      <printer name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
-      <printer name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX7450" driver="escp2-dx7450" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX8400" driver="escp2-dx8400" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson Stylus DX8450" driver="escp2-dx8450" manufacturer="Epson" model="79" parameters="cx3500_params" />
-      <printer name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate Dash" driver="escp2-picmatedash" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate Flash" driver="escp2-picmateflash" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate Pal" driver="escp2-picmatepal" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate Snap" driver="escp2-picmatesnap" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 100" driver="escp2-picmate100" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 200" driver="escp2-picmate200" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate 210" driver="escp2-picmate210" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 240" driver="escp2-picmate240" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 250" driver="escp2-picmate250" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 260" driver="escp2-picmate260" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 270" driver="escp2-picmate270" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 280" driver="escp2-picmate280" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 290" driver="escp2-picmate290" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson PictureMate 500" driver="escp2-picmate500" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson PictureMate 2005" driver="escp2-picmate2005" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
-      <printer name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
-      <printer name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
-      <printer name="Epson E 100" driver="escp2-e100" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson E 150" driver="escp2-e150" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 200" driver="escp2-e200" manufacturer="Epson" model="73" parameters="standard_params" />
-      <printer name="Epson E 300" driver="escp2-e300" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 500" driver="escp2-e500" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 520" driver="escp2-e520" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 700" driver="escp2-e700" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson E 720" driver="escp2-e720" manufacturer="Epson" model="86" parameters="standard_params" />
-      <printer name="Epson EM 900C" driver="escp2-em900c" manufacturer="Epson" model="13" parameters="standard_params" />
-      <printer name="Epson EM 930C" driver="escp2-em930c" manufacturer="Epson" model="34" parameters="standard_params" />
-      <printer name="Epson MC 2000" driver="escp2-mc2000" manufacturer="Epson" model="26" parameters="standard_params" />
-      <printer name="Epson MC 5000" driver="escp2-mc5000" manufacturer="Epson" model="40" parameters="pro_5500_params" />
-      <printer name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
-      <printer name="Epson MC 9000" driver="escp2-mc9000" manufacturer="Epson" model="31" parameters="pro_5500_params" />
-      <printer name="Epson MC 10000" driver="escp2-mc10000" manufacturer="Epson" model="41" parameters="standard_params" />
-      <printer name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
-      <printer name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
-      <printer name="Epson MJ 6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6" parameters="standard_params" />
-      <printer name="Epson MJ 8000C" driver="escp2-mj8000c" manufacturer="Epson" model="24" parameters="standard_params" />
-      <printer name="Epson PM 670C" driver="escp2-pm670c" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer name="Epson PM 700C" driver="escp2-pm700c" manufacturer="Epson" model="9" parameters="standard_params" />
-      <printer name="Epson PM 730C" driver="escp2-pm730c" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson PM 740C" driver="escp2-pm740c" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson PM 750C" driver="escp2-pm750c" manufacturer="Epson" model="7" parameters="standard_params" />
-      <printer name="Epson PM 760C" driver="escp2-pm760c" manufacturer="Epson" model="20" parameters="standard_params" />
-      <printer name="Epson PM 770C" driver="escp2-pm770c" manufacturer="Epson" model="14" parameters="standard_params" />
-      <printer name="Epson PM 780C" driver="escp2-pm780c" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson PM 790PT" driver="escp2-pm790pt" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson PM 800C" driver="escp2-pm800c" manufacturer="Epson" model="22" parameters="standard_params" />
-      <printer name="Epson PM 850PT" driver="escp2-pm850pt" manufacturer="Epson" model="51" parameters="standard_params" />
-      <printer name="Epson PM 870C" driver="escp2-pm870c" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson PM 880C" driver="escp2-pm880c" manufacturer="Epson" model="36" parameters="standard_params" />
-      <printer name="Epson PM 930C" driver="escp2-pm930c" manufacturer="Epson" model="58" parameters="standard_params" />
-      <printer name="Epson PM 940C" driver="escp2-pm940c" manufacturer="Epson" model="58" parameters="standard_params" />
-      <printer name="Epson PM 950C" driver="escp2-pm950c" manufacturer="Epson" model="53" parameters="standard_params" />
-      <printer name="Epson PM 970C" driver="escp2-pm970c" manufacturer="Epson" model="57" parameters="standard_params" />
-      <printer name="Epson PM 980C" driver="escp2-pm980c" manufacturer="Epson" model="57" parameters="standard_params" />
-      <printer name="Epson PM 2000C" driver="escp2-pm2000c" manufacturer="Epson" model="8" parameters="standard_params" />
-      <printer name="Epson PM 2200C" driver="escp2-pm2200c" manufacturer="Epson" model="54" parameters="standard_params" />
-      <printer name="Epson PM 3000C" driver="escp2-pm3000c" manufacturer="Epson" model="15" parameters="standard_params" />
-      <printer name="Epson PM 3300C" driver="escp2-pm3300c" manufacturer="Epson" model="23" parameters="standard_params" />
-      <printer name="Epson PM 3500C" driver="escp2-pm3500c" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson PM 3700C" driver="escp2-pm3700c" manufacturer="Epson" model="37" parameters="standard_params" />
-      <printer name="Epson PM 4000PX" driver="escp2-pm4000px" manufacturer="Epson" model="47" parameters="standard_params" />
-      <printer name="Epson PM 5000C" driver="escp2-pm5000c" manufacturer="Epson" model="27" parameters="standard_params" />
-      <printer name="Epson PM 7000C" driver="escp2-pm7000c" manufacturer="Epson" model="28" parameters="standard_params" />
-      <printer name="Epson PM 9000C" driver="escp2-pm9000c" manufacturer="Epson" model="30" parameters="standard_params" />
-      <printer name="Epson PM 10000" driver="escp2-pm10000" manufacturer="Epson" model="41" parameters="standard_params" />
-      <printer name="Epson PM A650" driver="escp2-pma650" manufacturer="Epson" model="74" parameters="standard_params" />
-      <printer name="Epson PM A750" driver="escp2-pma750" manufacturer="Epson" model="75" parameters="standard_params" />
-      <printer name="Epson PM A820" driver="escp2-pma820" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
-      <printer name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
-      <printer name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
-      <printer name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM D870" driver="escp2-pmd870" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="84" parameters="standard_params" />
-      <printer name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
-      <printer name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
-      <printer name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
-      <printer name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
-      <printer name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
-      <printer name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
-      <printer name="Epson PX G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67" parameters="standard_params" />
-      <printer name="Epson PX V500" driver="escp2-pxv500" manufacturer="Epson" model="61" parameters="standard_params" />
-      <printer name="Epson PX V600" driver="escp2-pxv600" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson PX V630" driver="escp2-pxv630" manufacturer="Epson" model="69" parameters="standard_params" />
-      <printer name="Epson PX V780" driver="escp2-pxv780" manufacturer="Epson" model="85" parameters="standard_params" />
-      <printer name="Epson PX 5500" driver="escp2-px5500" manufacturer="Epson" model="71" parameters="standard_params" />
-      <printer name="Epson PX 7000" driver="escp2-px7000" manufacturer="Epson" model="48" parameters="standard_params" />
-      <printer name="Epson PX 9000" driver="escp2-px9000" manufacturer="Epson" model="49" parameters="standard_params" />
-    </family>
-    <family name="pcl">
-      <parameters name="pcl_inkjet_params">
-        <parameter type="float" name="Gamma">0.818</parameter>
-        <parameter type="float" name="Density">0.786</parameter>
-      </parameters>
-      <parameters name="pcl_laser_params">
-        <parameter type="float" name="Gamma">1.000</parameter>
-        <parameter type="float" name="Density">1.000</parameter>
-      </parameters>
-      <printer name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2600" driver="pcl-apollo-p2600" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apollo P-2650" driver="pcl-apollo-p2650" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
-      <printer name="Apple Color StyleWriter 4100" driver="pcl-apple-4100" manufacturer="Apple" model="601" parameters="pcl_inkjet_params" />	<!-- Uses 600 series driver -->
-      <printer name="Apple Color StyleWriter 4500" driver="pcl-apple-4500" manufacturer="Apple" model="690" parameters="pcl_inkjet_params" />	<!-- Uses 690 driver -->
-      <printer name="Apple Color StyleWriter 6500" driver="pcl-apple-6500" manufacturer="Apple" model="800" parameters="pcl_inkjet_params" />	<!-- Uses 850 driver -->
-      <printer name="Apple LaserWriter Select 360" driver="pcl-apple-lw360" manufacturer="Apple" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
-      <printer name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-6550MC" driver="brother-mfc-6550mc" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-8300" driver="brother-mfc-8300" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-9500" driver="brother-mfc-9500" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Brother MFC-9600" driver="brother-mfc-9600" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
-      <printer name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
-      <printer name="Citizen ProJet II" driver="citizen-projet_ii" manufacturer="Citizen" model="2" parameters="pcl_laser_params" />
-      <printer name="DEC 1800" driver="dec-1800" manufacturer="DEC" model="3" parameters="pcl_laser_params" />
-      <printer name="DEC LN17" driver="dec-ln17" manufacturer="DEC" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
-      <printer name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 10V" driver="fujitsu-pp_10v" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 16DV" driver="fujitsu-pp_16dv" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 20W" driver="fujitsu-pp_20w" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
-      <printer name="Fujitsu PrintPartner 8000" driver="fujitsu-pp_8000" manufacturer="Fujitsu" model="3" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 4 Printer" driver="pcl-g_4" manufacturer="Generic" model="2" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 4 LF Printer" driver="pcl-g_4_l" manufacturer="Generic" model="23" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5 Printer" driver="pcl-g_5" manufacturer="Generic" model="3" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5 LF Printer" driver="pcl-g_5_l" manufacturer="Generic" model="33" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5c Printer" driver="pcl-g_5c" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5c LF Printer" driver="pcl-g_5c_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5e Printer" driver="pcl-g_5e" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 5e LF Printer" driver="pcl-g_5e_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 6/PCL XL Printer" driver="pcl-g_6" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
-      <printer name="Generic PCL 6/PCL XL LF Printer" driver="pcl-g_6_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
-      <printer name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
-      <printer name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Color LaserJet 8550GN" driver="hp-clj_8550gn" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 250C" driver="pcl-desnj-250" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 430" driver="pcl-desnj-430" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 450C" driver="pcl-desnj-450" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 455CA" driver="pcl-desnj-455" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 488CA" driver="pcl-desnj-488" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 700" driver="pcl-desnj-700" manufacturer="HP" model="10700" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 750C Plus" driver="hp-desnj_750c_plus" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 750C" driver="pcl-750" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
-      <printer name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 510" driver="hp-dj_510" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
-      <printer name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
-      <printer name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2P Plus" driver="hp-lj_2p_plus" manufacturer="HP" model="21" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2P" driver="pcl-2p" manufacturer="HP" model="21" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3" driver="pcl-3" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
-      <printer name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
-      <printer name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
-      <printer name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
-      <printer name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
-      <printer name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
-      <printer name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
-      <printer name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
-      <printer name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
-      <printer name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
-      <printer name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
-      <printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
-      <printer name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
-      <printer name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
-      <printer name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400" driver="okidata-ol400" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400e" driver="okidata-ol400e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL400ex" driver="okidata-ol400ex" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL410e" driver="okidata-ol410e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata OL600e" driver="okidata-ol600e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
-      <printer name="Okidata OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
-      <printer name="Okidata Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
-      <printer name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
-      <printer name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
-      <printer name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
-      <printer name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
-      <printer name="Ricoh Aficio 220" driver="ricoh-afc_220" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer name="Ricoh Aficio 401" driver="ricoh-afc_401" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer name="Ricoh Aficio 700" driver="ricoh-afc_700" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-4600" driver="samsung-ml-4600" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-5000a" driver="samsung-ml-5000a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-6000" driver="samsung-ml-6000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-6100" driver="samsung-ml-6100" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7000" driver="samsung-ml-7000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7000N" driver="samsung-ml-7000n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7000P" driver="samsung-ml-7000p" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung ML-7050" driver="samsung-ml-7050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
-      <printer name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
-      <printer name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
-      <printer name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
-      <printer name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
-      <printer name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
-      <printer name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
-      <printer name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
-      <printer name="Xerox Able 1406" driver="xerox-able_1406" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint 4508" driver="xerox-dp_4508" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-      <printer name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
-    </family>
-    <family name="lexmark">
-      <parameters name="standard_params">
-        <parameter type="float" name="MagentaGamma">0.95</parameter>
-        <parameter type="float" name="Gamma">0.5</parameter>
-        <parameter type="float" name="Density">2.0</parameter>
-      </parameters>
-      <printer name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
-      <printer name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
-      <printer name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
-      <printer name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
-    </family>
-    <family name="dyesub">
-      <printer name="Olympus P-10" driver="olympus-p10" manufacturer="Olympus" model="2" />
-      <printer name="Olympus P-11" driver="olympus-p11" manufacturer="Olympus" model="2" />
-      <printer name="Olympus P-200" driver="olympus-p200" manufacturer="Olympus" model="4" />
-      <printer name="Olympus P-300" driver="olympus-p300" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-300E" driver="olympus-p300e" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-300U" driver="olympus-p300u" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-330E" driver="olympus-p330e" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-330NE" driver="olympus-p330ne" manufacturer="Olympus" model="0" />
-      <printer name="Olympus P-400" driver="olympus-p400" manufacturer="Olympus" model="1" />
-      <printer name="Olympus P-440" driver="olympus-p440" manufacturer="Olympus" model="3" />
-      <printer name="Olympus P-S100" driver="olympus-ps100" manufacturer="Olympus" model="20" />
-      <printer name="Canon CP-10" driver="canon-cp10" manufacturer="Canon" model="1002" />
-      <printer name="Canon CP-100" driver="canon-cp100" manufacturer="Canon" model="1000" />
-      <printer name="Canon CP-200" driver="canon-cp200" manufacturer="Canon" model="1000" />
-      <printer name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" />
-      <printer name="Canon CP-300" driver="canon-cp300" manufacturer="Canon" model="1000" />
-      <printer name="Canon CP-330" driver="canon-cp330" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-730" driver="canon-cp730" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-740" driver="canon-cp740" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY-CP-750" driver="canon-cp750" manufacturer="Canon" model="1001" />
-      <printer name="Canon SELPHY ES1" driver="canon-es1" manufacturer="Canon" model="1003" />
-      <printer name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1003" />
-      <printer name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1003" />
-      <printer name="Sony DPP-EX5" driver="sony-dppex5" manufacturer="Sony" model="2002" />
-      <printer name="Sony DPP-EX7" driver="sony-dppex5" manufacturer="Sony" model="2002" />
-      <printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" />
-      <printer name="Sony UP-DR100" driver="sony-updr100" manufacturer="Sony" model="2003" />
-      <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001" />
-      <printer name="Fujifilm Printpix-CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000" />
-      <printer name="Fujifilm Printpix-CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001" />
-      <printer name="Fujifilm FinePix-NX-500" driver="fujifilm-nx500" manufacturer="Fujifilm" model="3002" />
-      <printer name="Kodak Easyshare-Printer-Dock" driver="kodak-dock" manufacturer="Kodak" model="4000"/>
-      <printer name="Shinko CHC-S9045" driver="shinko-chcs9045" manufacturer="Shinko" model="5000"/>
-    </family>
-    <family name="raw">
-      <printer name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
-      <printer name="RAW DATA 8 bit" driver="raw-data-8" manufacturer="" model="1" />
-    </family>
-  </printdef>
-</gutenprint>
diff --git a/src/main/sequence.c b/src/main/sequence.c
index 9cf5885..3f7091c 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sequence.c,v 1.25 2008/01/21 23:19:41 rlk Exp $"
+ * "$Id: sequence.c,v 1.26 2008/06/15 16:23:39 rlk Exp $"
  *
  *   Sequence data type.  This type is designed to be derived from by
  *   the curve and dither matrix types.
@@ -420,8 +420,8 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
 	      /* Datum was valid, so now add to the sequence */
 	      stp_sequence_set_point(ret, i, tmpval);
 	      i++;
-	      child = child->next;
 	    }
+	  child = child->next;
 	}
       if (i < point_count)
 	{
diff --git a/src/main/xml.c b/src/main/xml.c
index 5c38736..30d2f2a 100644
--- a/src/main/xml.c
+++ b/src/main/xml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml.c,v 1.38 2007/05/26 15:53:06 rlk Exp $"
+ * "$Id: xml.c,v 1.42 2008/06/08 15:10:36 rlk Exp $"
  *
  *   XML parser - process Gutenprint XML data with mxml.
  *
@@ -200,18 +200,8 @@ stp_xml_exit(void)
 void
 stp_xml_parse_file_named(const char *name)
 {
-  stp_list_t *dir_list;                  /* List of directories to scan */
-  stp_list_t *file_list;                 /* List of XML files */
+  stp_list_t *file_list = stpi_list_files_on_data_path(name); /* List of XML files */
   stp_list_item_t *item;                 /* Pointer to current list item */
-  if (!(dir_list = stp_list_create()))
-    return;
-  stp_list_set_freefunc(dir_list, stp_list_node_free_data);
-  if (getenv("STP_DATA_PATH"))
-    stp_path_split(dir_list, getenv("STP_DATA_PATH"));
-  else
-    stp_path_split(dir_list, PKGXMLDATADIR);
-  file_list = stp_path_search(dir_list, name);
-  stp_list_destroy(dir_list);
   item = stp_list_get_start(file_list);
   while (item)
     {
@@ -318,7 +308,7 @@ long
 stp_xmlstrtol(const char *textval)
 {
   long val; /* The value to return */
-  val = strtol(textval, (char **)NULL, 10);
+  val = strtol(textval, (char **)NULL, 0);
 
   return val;
 }
@@ -330,7 +320,7 @@ unsigned long
 stp_xmlstrtoul(const char *textval)
 {
   unsigned long val; /* The value to return */
-  val = strtoul(textval, (char **)NULL, 10);
+  val = strtoul(textval, (char **)NULL, 0);
 
   return val;
 }
@@ -347,6 +337,133 @@ stp_xmlstrtod(const char *textval)
   return val;
 }
 
+/*
+ * Convert an encoded text string into a raw.
+ */
+stp_raw_t *
+stp_xmlstrtoraw(const char *textval)
+{
+  size_t tcount;
+  stp_raw_t *raw;
+  unsigned char *answer;
+  unsigned char *aptr;
+  if (! textval || *textval == 0)
+    return NULL;
+  tcount = strlen(textval);
+  raw = stp_zalloc(sizeof(stp_raw_t));
+  answer = stp_malloc(tcount + 1); /* Worst case -- we may not need it all */
+  aptr = answer;
+  raw->data = answer;
+  while (*textval)
+    {
+      if (*textval != '\\')
+	{
+	  *aptr++ = *textval++;
+	  raw->bytes++;
+	}
+      else
+	{
+	  textval++;
+	  if (textval[0] >= '0' && textval[0] <= '3' &&
+	      textval[1] >= '0' && textval[1] <= '7' &&
+	      textval[2] >= '0' && textval[2] <= '7')
+	    {
+	      *aptr++ = (((textval[0] - '0') << 6) +
+			 ((textval[1] - '0') << 3) +
+			 ((textval[2] - '0') << 0));
+	      raw->bytes++;
+	      textval += 3;
+	    }
+	  else if (textval[0] == '\0' || textval[1] == '\0' || textval[2] == '\0')
+	    break;
+	  else
+	    textval += 3;
+	}
+    }
+  *aptr = '\0';
+  return raw;
+}
+
+char *
+stp_rawtoxmlstr(const stp_raw_t *raw)
+{
+  if (raw && raw->bytes > 0)
+    {
+      int i;
+      const unsigned char *data = (const unsigned char *) (raw->data);
+      char *answer = stp_malloc((raw->bytes * 4) + 1); /* \012 */
+      unsigned char *aptr = (unsigned char *) answer;
+      for (i = 0; i < raw->bytes; i++)
+	{
+	  if (data[i] > ' ' && data[i] < '\177' && data[i] != '\\' &&
+	      data[i] != '<' && data[i] != '>' && data[i] != '&')
+	    *aptr++ = data[i];
+	  else
+	    {
+	      *aptr++ = '\\';
+	      *aptr++ = '0' + ((data[i] & '\300') >> 6);
+	      *aptr++ = '0' + ((data[i] & '\070') >> 3);
+	      *aptr++ = '0' + ((data[i] & '\007') >> 0);
+	    }
+	}
+      *aptr = '\0';
+      return answer;
+    }
+  return NULL;
+}
+
+char *
+stp_strtoxmlstr(const char *str)
+{
+  if (str && strlen(str) > 0)
+    {
+      int i;
+      int bytes = strlen(str);
+      const unsigned char *data = (const unsigned char *) (str);
+      char *answer = stp_malloc((bytes * 4) + 1); /* "\012" is worst case */
+      unsigned char *aptr = (unsigned char *) answer;
+      for (i = 0; i < bytes; i++)
+	{
+	  if (data[i] > ' ' && data[i] < '\177' && data[i] != '\\' &&
+	      data[i] != '<' && data[i] != '>' && data[i] != '&')
+	    *aptr++ = data[i];
+	  else
+	    {
+	      *aptr++ = '\\';
+	      *aptr++ = '0' + ((data[i] & '\300') >> 6);
+	      *aptr++ = '0' + ((data[i] & '\070') >> 3);
+	      *aptr++ = '0' + ((data[i] & '\007') >> 0);
+	    }
+	}
+      *aptr = '\0';
+      return answer;
+    }
+  return NULL;
+}
+
+void
+stp_prtraw(const stp_raw_t *raw, FILE *fp)
+{
+  if (raw && raw->bytes > 0)
+    {
+      int i;
+      const unsigned char *data = (const unsigned char *) (raw->data);
+      for (i = 0; i < raw->bytes; i++)
+	{
+	  if (data[i] > ' ' && data[i] < '\177' && data[i] != '\\' &&
+	      data[i] != '<' && data[i] != '>' && data[i] != '&')
+	    fputc(data[i], fp);
+	  else
+	    {
+	      fputc('\\', fp);
+	      fputc('0' + ((data[i] & '\300') >> 6), fp);
+	      fputc('0' + ((data[i] & '\070') >> 3), fp);
+	      fputc('0' + ((data[i] & '\007') >> 0), fp);
+	    }
+	}
+    }
+}
+
 
 /*
  * Find a node in an XML tree.  This function takes an xmlNodePtr,
diff --git a/src/main/xmlppd.c b/src/main/xmlppd.c
index 6bd2611..10c2bb9 100644
--- a/src/main/xmlppd.c
+++ b/src/main/xmlppd.c
@@ -212,6 +212,7 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
   int		option_count;
   int		order_length;
   char		*order_list;
+  int		in_comment;
 
 
  /*
@@ -276,6 +277,22 @@ 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)) == '%')
+	    {
+	      while (1)
+		{
+		  ch = getc(fp);
+		  if (ch == '\n' || ch == EOF)
+		    break;
+		}
+	      continue;
+	    }
+	  else
+	    ungetc(ch, fp);
+	}
 
       while ((ch != '\n' || inquote) && bufptr < (buffer + sizeof(buffer) - 1))
 	{
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index f6c13bc..d463d43 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 
 
@@ -49,7 +49,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -72,7 +73,7 @@ am_testpattern_OBJECTS = testpattern.$(OBJEXT) testpatterny.$(OBJEXT) \
 testpattern_OBJECTS = $(am_testpattern_OBJECTS)
 testpattern_DEPENDENCIES = $(GUTENPRINT_LIBS)
 SCRIPTS = $(noinst_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -138,6 +139,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -158,6 +160,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -190,6 +193,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -210,9 +214,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -239,6 +244,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -363,8 +369,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -471,8 +477,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +490,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +501,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c
index b44da2d..ec03a1e 100644
--- a/src/testpattern/printer_options.c
+++ b/src/testpattern/printer_options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printer_options.c,v 1.4 2007/03/05 00:04:00 tillkamppeter Exp $"
+ * "$Id: printer_options.c,v 1.5 2008/06/07 22:47:35 rlk Exp $"
  *
  *   Dump the per-printer options for the OpenPrinting database
  *
@@ -101,12 +101,14 @@ main(int argc, char **argv)
 	  stp_describe_parameter(pv, p->name, &desc);
 	  if (desc.is_active)
 	    {
-	      printf("$longnames{'%s'} = '%s';\n",
-		     desc.name, desc.text);
-	      printf("$param_classes{'%s'} = %d;\n",
-		     desc.name, desc.p_class);
-	      printf("$param_levels{'%s'} = %d;\n",
-		     desc.name, desc.p_level);
+	      printf("$longnames{'%s'}{'%s'} = '%s';\n",
+		     driver, desc.name, desc.text);
+	      printf("$param_classes{'%s'}{'%s'} = %d;\n",
+		     driver, desc.name, desc.p_class);
+	      printf("$param_types{'%s'}{'%s'} = %d;\n",
+		     driver, desc.name, desc.p_type);
+	      printf("$param_levels{'%s'}{'%s'} = %d;\n",
+		     driver, desc.name, desc.p_level);
 	      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 		{
 		  count = stp_string_list_count(desc.bounds.str);
diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern
index 3fa058e..0462c0b 100755
--- a/src/testpattern/run-testpattern
+++ b/src/testpattern/run-testpattern
@@ -3,7 +3,7 @@
 retval=0;
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../main
+    STP_DATA_PATH=`pwd`/../xml
     export STP_DATA_PATH
 fi
 
diff --git a/src/testpattern/run-testpattern-1 b/src/testpattern/run-testpattern-1
index f606235..aceff8d 100755
--- a/src/testpattern/run-testpattern-1
+++ b/src/testpattern/run-testpattern-1
@@ -3,7 +3,7 @@
 retval=0
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../main
+    STP_DATA_PATH=`pwd`/../xml
     export STP_DATA_PATH
 fi
 
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index 065d8f4..b35bf90 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -6,49 +6,64 @@ Getopt::Long::Configure("bundling", "no_ignore_case", "pass_through");
 use strict;
 
 my $valgrind = 0;
-my $cachegrind = 0;
+my $callgrind = 0;
 my $gdb_attach = 0;
-my $calc_md5 = 0;
+my $calc_md5_file = undef;
+my $calc_md5_dir = undef;
 my $dontrun = 0;
 my $retval = 0;
 my $testpattern_command;
 my @printer_list = ();
 my @special_options = ();
-my @standard_options = qw(InkType DitherAlgorithm Duplex);
+my @standard_options = qw(InkType InkSet DitherAlgorithm Duplex MediaType InputSlot ColorCorrection ImageType FullBleed Quality UseGloss Weave RawChannels PrintingDirection Density CyanDensity);
 my $global_status = 1;
+my $run_installed = 0;
+my $use_min_res = 0;
 my $output = undef;
 
 my @extras = ();
+my @job_extras = ();
 my @messages = ();
 my @global_messages = ();
+my @families = ();
 my %stpdata = ();
 my %models_found = ();
 my %models;
 my %families;
 my $skip_duplicate_printers = 0;
 my $std_pages = 1;
+my $skip_resolutions = 0;
+my $quiet = 0;
+my $single = 0;
 
 my @default_options = ();
-my %base_settings = ("DitherAlgorithm" => "Fast",
-		     "ColorCorrection" => "Raw");
+my %base_settings = ("DitherAlgorithm" => "Fast");
+
+my %param_types;
+my %param_classes;
+my %param_levels;
+my %stp_float_values;
 
 GetOptions("v+"  => \$valgrind,
-	   "c"   => \$cachegrind,
+	   "c"   => \$callgrind,
 	   "g"   => \$gdb_attach,
 	   "n"   => \$dontrun,
 	   "p:i" => \$std_pages,
 	   "s!"  => \$skip_duplicate_printers,
+	   "S!"  => \$single,
+	   "i!"  => \$run_installed,
+	   "r!"  => \$skip_resolutions,
+	   "R+"  => \$use_min_res,
+	   "q!"  => \$quiet,
 	   "o=s" => \@special_options,
+	   "f=s" => \@families,
 	   "O=s" => \$output,
 	   "d=s" => \@default_options,
-	   "m:s" => \$calc_md5);
+	   "m:s" => \$calc_md5_dir,
+	   "M:s" => \$calc_md5_file);
 
 my $pages = $std_pages;
 
-if (defined $calc_md5 && $calc_md5 eq "0") {
-    $calc_md5 = undef;
-}
-
 if (! @special_options) {
     @special_options = @standard_options;
 }
@@ -65,39 +80,64 @@ foreach my $opt (@default_options) {
 my $pwd = `pwd`;
 chomp $pwd;
 
-if (! defined $ENV{"STP_DATA_PATH"}) {
-    $ENV{"STP_DATA_PATH"} = "${pwd}/../main";
+if (! $run_installed && ! defined $ENV{"STP_DATA_PATH"}) {
+    $ENV{"STP_DATA_PATH"} = "${pwd}/../xml";
 }
 
 if (! defined $ENV{"STP_MODULE_PATH"}) {
     $ENV{"STP_MODULE_PATH"} = "${pwd}/../main:${pwd}/../main/.libs";
 }
 
-sub set_opt($$) {
-    my ($opt, $val) = @_;
-    push @extras, "parameter \"$opt\" \"$val\";\n";
+sub set_opt($$$) {
+    my ($opt, $val, $printer) = @_;
+    my ($type) = $param_types{$printer}{$opt};
+    if ($type == 1) {
+	push @extras, "parameter_int \"$opt\" $val;\n";
+    } elsif ($type == 2) {
+	my ($xval) = $val;
+	if ($val =~ /true/i) {
+	    $xval = 1;
+	} elsif ($val =~ /false/i) {
+	    $xval = 0;
+	}
+	push @extras, "parameter_bool \"$opt\" $xval;\n";
+    } elsif ($type == 3) {
+	push @extras, "parameter_float \"$opt\" $val;\n";
+    } elsif ($type == 4) {
+	push @extras, "parameter_curve \"$opt\" \"$val\";\n";
+    } else {
+	push @extras, "parameter \"$opt\" \"$val\";\n";
+    } 
 }
 
 sub set_message($) {
     my ($message) = @_;
-    push @messages, "message \"$message\";\n";
+    push @messages, "message \"$message\";\n" if (! $quiet);
 }
 
 sub set_global_message($) {
     my ($message) = @_;
-    push @global_messages, "message \"$message\";\n";
+    push @global_messages, "message \"$message\";\n" if (! $quiet);
 }
 
-sub print_one_testpattern($) {
-    my ($printer) = @_;
+sub print_one_testpattern($;$) {
+    my ($printer, $raw) = @_;
     my $stuff = join "", @global_messages;
+    $stuff .= join "", @job_extras;
     foreach my $page (0..$pages - 1) {
     	$stuff .= "printer \"$printer\";\n";
+	$stuff .= "parameter \"PageSize\" \"Auto\";\n";
 	$stuff .= join "", @extras, @messages;
-	if ($pages > 1) {
+	if (! $quiet && $pages > 1) {
 	    $stuff .= "message \"(page $page)\";\n";
 	}
 	$stuff .= "parameter_int \"PageNumber\" $page;\n";
+	if ($page == 0) {
+	    $stuff .= "start_job;\n";
+	}
+	if ($page == $pages - 1) {
+	    $stuff .= "end_job;\n";
+	}
 	$stuff .= << 'EOF';
 hsize 0.1;
 vsize 0.1;
@@ -105,6 +145,33 @@ left 0.15;
 top 0.15;
 blackline 0;
 steps 16;
+EOF
+	if ($raw > 0) {
+	    $stuff .= "mode extended $raw 16;\n";
+	    $stuff .= "xpattern ";
+	    for (my $i = 0; $i < $raw; $i++) {
+		$stuff .= "0.0 0.0 1.0  ";
+	    }
+	    $stuff .= ";\n";
+	    for (my $i = 0; $i < $raw; $i++) {
+		$stuff .= "xpattern ";
+		for (my $j = 0; $j < $raw; $j++) {
+		    if ($i == $j) {
+			$stuff .= "0.0 1.0 1.0  ";
+		    } else {
+			$stuff .= "0.0 0.0 1.0  ";
+		    }
+		}
+		$stuff .= ";\n";
+	    }
+	    $stuff .= "xpattern ";
+	    for (my $i = 0; $i < $raw; $i++) {
+		$stuff .= "0.0 0.0 1.0  ";
+	    }
+	    $stuff .= ";\n";
+	    $stuff .= "end;\n";
+	} else {
+	    $stuff .= << 'EOF';
 mode rgb 8;
 pattern 0.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0  0.0 0.0 1.0  0.0 0.0 1.0  0.0 0.0 1.0 ;
 pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.0 1.0  0.0 1.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0;
@@ -154,6 +221,7 @@ pattern 1.0 1.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.1 1.0 0.0 0.1 1.0 0.0 0.0 1.0;
 pattern 0.0 0.0 1.0 1.0 1.0 0.0 0.9 1.0  0.0 0.1 1.0 0.0 0.1 1.0 0.0 0.0 1.0;
 end;
 EOF
+	}
     }
     return $stuff;
 }
@@ -188,30 +256,100 @@ sub do_print {
     }
 }
 
+sub do_output($) {
+    my ($outkey) = @_;
+    if (defined $output || defined $calc_md5_dir ||
+	defined $calc_md5_file) {
+	my $md5_cmd;
+	my $outbase = "${outkey}.prn";
+	my $outfile = "$output/$outbase";
+	if (defined $calc_md5_file) {
+	    $md5_cmd = "md5sum -b | sed 's/-/$outbase/' >> '$calc_md5_file'";
+	} elsif (defined $calc_md5_dir) {
+	    my $md5_dir = $calc_md5_dir;
+	    if (defined $calc_md5_dir && $calc_md5_dir eq "") {
+		$md5_dir = $output;
+	    }
+	    my $md5file = "$md5_dir/${outkey}.md5";
+	    if (! $md5_dir) {
+		$md5file = "${outkey}.md5";
+	    }
+	    $md5_cmd = "md5sum -b | sed 's/-/$outbase/' > '$md5file'";
+	}
+	if ($output && $md5_cmd ne "") {
+	    push @job_extras, "output \"|tee '$outfile' | $md5_cmd\";\n";
+	} elsif ($output) {
+	    push @job_extras, "output \"$outfile\";\n";
+	} else {
+	    push @job_extras, "output \"|$md5_cmd\";\n";
+	}
+    }
+}
 
-sub do_printer {
+sub build_list($$) {
+    my ($keys, $printer) = @_;
+    my (@keys) = split (/,/, $keys);
+    my ($key) = $keys[0];
+    my ($rest);
+    my (@stuff);
+    if ($#keys > 0) {
+	$rest = join ",", @keys[1..$#keys];
+	@stuff = build_list($rest, $printer);
+    }
+    my (@tmp);
+    if ($param_types{$printer}{$key} == 3) {
+	my ($minv) = $stp_float_values{$printer}{'MINVAL'}{$key};
+	my ($defv) = $stp_float_values{$printer}{'DEFVAL'}{$key};
+	my ($maxv) = $stp_float_values{$printer}{'MAXVAL'}{$key};
+	push @tmp, $minv;
+	push @tmp, ($minv + $defv) / 2.0;
+	push @tmp, $defv;
+	push @tmp, ($defv + $maxv) / 2.0;
+	push @tmp, $maxv;
+    } elsif (defined($param_types{$printer}{$key})) {
+	@tmp = keys %{$stpdata{$printer}{$key}};
+    }
+    if (! @tmp) {
+	return @stuff;
+    } elsif (! @stuff) {
+	return @tmp;
+    } else {
+	my (@answer);
+	foreach my $i (@tmp) {
+	    foreach my $j (@stuff) {
+		push @answer, "$i,$j";
+	    }
+	}
+	return @answer;
+    }
+    return @tmp;
+}
+
+sub build_key($$) {
+    my ($keys, $printer) = @_;
+    my (@keys) = split (/,/, $keys);
+    my (@answer) = grep { defined $param_types{$printer}{$_} } @keys;
+    return join ",", @answer;
+}
+
+sub do_printer($$) {
     my ($printer, $fh) = @_;
     my $tmp;
     my $min_res_name;
     my $min_res_value = 0;
     my $first_time = 1;
-    my $model_id = $models{$printer};
-    my $family_id = $families{$printer};
     my $key;
     my %opt_vals = {};
-    if ($skip_duplicate_printers && $models_found{$family_id}{$model_id}) {
-	return;
-    } else {
-	$models_found{$family_id}{$model_id} = 1;
-    }
     $tmp = $stpdata{$printer}{'Resolution'};
     my (@resolutions) = grep {$_ ne 'None' } keys %$tmp;
     $tmp = $stpdata{$printer}{'PrintingMode'};
     my (@printing_modes) = grep {$_ ne 'None' } keys %$tmp;
     foreach $key (@special_options) {
-	$tmp = $stpdata{$printer}{$key};
-	my (@tmp) = grep {$_ ne 'None' } keys %$tmp;
-	$opt_vals{$key} = \@tmp;
+	my $nkey = build_key($key, $printer);
+	if ($nkey ne "") {
+	    my (@vals) = build_list($nkey, $printer);
+	    $opt_vals{$nkey} = \@vals;
+	}
     }
     foreach $tmp (sort @resolutions) {
 	my $res_value = ($stpdata{$printer}{'x_resolution'}{$tmp} *
@@ -221,97 +359,91 @@ sub do_printer {
 	    $min_res_name = $tmp;
 	}
     }
+    if ($use_min_res > 1) {
+	@resolutions = ($min_res_name);
+    }
     # We want to do all resolutions and all ink types in both color modes.
     # We don't need to do both resolutions and ink types.
     my $pmode;
     foreach $pmode (@printing_modes) {
 	my ($resolution);
 	$pages = $std_pages;
-	foreach $resolution (@resolutions) {
-	    @extras = ();
-	    @messages = ();
-	    @global_messages = ();
-	    if ($first_time) {
-		set_global_message("$printer\n");
-		$first_time = 0;
-	    }
-	    set_opt("PrintingMode", $pmode);
-	    set_opt("Resolution", $resolution);
-	    map { set_opt($_, $base_settings{$_})} keys %base_settings;
-	    if (defined $output || defined $calc_md5) {
-		my $outkey = "${printer}_PrintingMode_${pmode}_Resolution_${resolution}";
-		my $md5_dir = $calc_md5;
-		if (defined $calc_md5 && $calc_md5 eq "") {
-		    $md5_dir = $output;
-		}
-		my $outbase = "${outkey}.prn";
-		my $outfile = "$output/$outbase";
-		my $md5file = "$md5_dir/${outkey}.md5";
-		if (! $md5_dir) {
-		    $md5file = "${outkey}.md5";
-		}
-		if ($output && $calc_md5) {
-		    push @extras, "output \"|tee '$outfile' | md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
-		} elsif ($output) {
-		    push @extras, "output \"$outfile\";\n";
-		} else {
-		    push @extras, "output \"|md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
+	if (! $skip_resolutions) {
+	    foreach $resolution (@resolutions) {
+		@extras = ();
+		@job_extras = ();
+		@messages = ();
+		@global_messages = ();
+		if ($first_time) {
+		    set_global_message("$printer\n");
+		    $first_time = 0;
 		}
+		set_opt("PrintingMode", $pmode, $printer);
+		set_opt("Resolution", $resolution, $printer);
+		map { set_opt($_, $base_settings{$_}, $printer)} keys %base_settings;
+		do_output("${printer}_PrintingMode_${pmode}_Resolution_${resolution}");
+		set_message("    ${pmode}+${resolution}");
+		my $output = print_one_testpattern($printer);
+		do_print( $output, $fh );
 	    }
-	    set_message("    ${pmode}+${resolution}");
-	    my $output = print_one_testpattern($printer);
-	    do_print( $output, $fh );
 	}
-	foreach $key (@special_options) {
+	foreach $key (keys %opt_vals) {
+	    next if ($key eq "RawChannels" && $pmode ne "Color");
+	    my (@subkeys) = split (/,/, $key);
 	    $tmp = $opt_vals{$key};
-	    my (@opts) = @$tmp;
-	    if ($#opts >= 1) {
+	    if (defined $tmp && $tmp >= 1) {
+		my (@opts) = @$tmp;
 		my $opt;
+		my $rawval;
 		foreach $opt (@opts) {
-		    my ($out_file);
+		    my (@subopts) = split (/,/, $opt);
 		    @extras = ();
+		    @job_extras = ();
 		    @messages = ();
 		    @global_messages = ();
 		    if ($first_time) {
 			set_global_message("$printer\n");
 			$first_time = 0;
 		    }
-		    set_opt("PrintingMode", $pmode);
-		    set_opt("Resolution", $min_res_name);
-		    set_opt($key, $opt);
+		    set_opt("PrintingMode", $pmode, $printer);
+		    if ($use_min_res) {
+			set_opt("Resolution", $min_res_name, $printer);
+		    }
+		    my (@mvals);
+		    my (@ovals);
+		    map {
+			my $k = $subkeys[$_];
+			my $v = $subopts[$_];
+			if ($k eq "RawChannels") {
+			    $rawval = $v;
+			} else {
+			    set_opt($k, $v, $printer);
+			}
+			push @mvals, "${k}_${v}";
+			push @ovals, "${k}=${v}";
+		    } (0..$#subkeys);
+		    # FIXME! need to handle Duplex as a subkey
 		    map {
 			if ($key ne $_) {
-			    set_opt($_, $base_settings{$_});
+			    set_opt($_, $base_settings{$_}, $printer);
 			    if ($key eq "Duplex") {
-				set_opt("JobMode", "Job");
+				set_opt("JobMode", "Job", $printer);
 				$pages = 4;
 			    } else {
 				$pages = $std_pages;
 			    }
 			}
 		    } keys %base_settings;
-		    if (defined $output || defined $calc_md5) {
-			my $outkey = "${printer}_PrintingMode_${pmode}_Resolution_${min_res_name}_${key}_${opt}";
-			my $md5_dir = $calc_md5;
-			if (defined $calc_md5 && $calc_md5 eq "") {
-			    $md5_dir = $output;
-			}
-			my $outbase = "${outkey}.prn";
-			my $outfile = "$output/$outbase";
-			my $md5file = "$md5_dir/${outkey}.md5";
-			if (! $md5_dir) {
-			    $md5file = "${outkey}.md5";
-			}
-			if (defined $output && defined $calc_md5) {
-			    push @extras, "output \"|tee '$outfile' | md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
-			} elsif ($output) {
-			    push @extras, "output \"$outfile\";\n";
-			} else {
-			    push @extras, "output \"|md5sum -b | sed 's/-/$outbase/' > '$md5file'\";\n";
-			}
+		    my ($mstring) = join "_", @mvals;
+		    my ($ostring) = join "+", @ovals;
+		    if ($use_min_res) {
+			do_output("${printer}_PrintingMode_${pmode}_Resolution_${min_res_name}_${mstring}");
+			set_message("    ${ostring}+${pmode}+${min_res_name}");
+		    } else {
+			do_output("${printer}_PrintingMode_${pmode}_${mstring}");
+			set_message("    ${ostring}+${pmode}");
 		    }
-		    set_message("    ${key}=${opt}+${pmode}+${min_res_name}");
-		    my $output = print_one_testpattern($printer);
+		    my $output = print_one_testpattern($printer, $rawval);
 		    do_print( $output, $fh );
 		}
 	    }
@@ -319,14 +451,27 @@ sub do_printer {
     }
 }
 
+my (@nprinter_list);
+foreach my $printer (@printer_list) {
+    my $model_id = $models{$printer};
+    my $family_id = $families{$printer};
+    if (($skip_duplicate_printers && $models_found{$family_id}{$model_id}) ||
+	(@families && ! grep { $family_id eq $_ } @families)) {
+    } else {
+	$models_found{$family_id}{$model_id} = 1;
+	push @nprinter_list, $printer;
+    }
+}
+@printer_list = @nprinter_list;
+
 if ($dontrun) {
     map { do_printer($_, \*STDOUT) } @printer_list;
     exit 0;
 } else {
     my $valgrind_command;
     my $valopts;
-    if ($cachegrind) {
-	$valopts = '--tool=cachegrind';
+    if ($callgrind) {
+	$valopts = '--tool=callgrind --dump-instr=yes --trace-jump=yes';
 	$valgrind = 4;
     } elsif ($valgrind) {
 	$valopts = '--tool=memcheck';
@@ -348,18 +493,38 @@ if ($dontrun) {
 	mkdir $output || die "Can't create directory $output: $!\n";
     }
 
-    if (defined $calc_md5 && $calc_md5 ne "" && ! -d $calc_md5) {
-	mkdir $calc_md5 || die "Can't create directory $calc_md5: $!\n";
+    if (defined $calc_md5_dir && $calc_md5_dir ne "" && ! -d $calc_md5_dir) {
+	mkdir $calc_md5_dir || die "Can't create directory $calc_md5_dir: $!\n";
+    }
+
+    if (defined $calc_md5_file) {
+	unlink $calc_md5_file;
+	system "touch $calc_md5_file";
     }
 
     my $status = 1;
     my ($suppress);
-    if (! defined $output && ! defined $calc_md5) { $suppress = '-n'; }
-    $testpattern_command = "$valgrind_command ./testpattern $suppress";
-    open TESTPATTERN, "|$testpattern_command" or
-	die "Can't run $testpattern_command: $!\n";
-    map { do_printer($_, \*TESTPATTERN) } @printer_list;
-    $status = close TESTPATTERN;
+    if (! defined $output && ! defined $calc_md5_dir &&
+	! defined $calc_md5_file) {
+	$suppress = '-n';
+    }
+    my ($qopt) = $quiet ? "-q" : "";
+    $testpattern_command = "$valgrind_command ./testpattern $suppress $qopt";
+    if ($single) {
+	foreach my $printer (@printer_list) {
+	    open TESTPATTERN, "|$testpattern_command" or
+		die "Can't run $testpattern_command: $!\n";
+	    do_printer($printer, \*TESTPATTERN);
+	    $status |= close TESTPATTERN;
+	    $status |= ($? & 255);
+	    last if ($? & 255);
+	}
+    } else {
+	open TESTPATTERN, "|$testpattern_command" or
+	    die "Can't run $testpattern_command: $!\n";
+	map { do_printer($_, \*TESTPATTERN) } @printer_list;
+	$status = close TESTPATTERN;
+    }
     if ($status) {
 	exit 0;
     } else {
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index a0ef100..512739d 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.c,v 1.48 2008/01/27 21:44:21 rlk Exp $"
+ * "$Id: testpattern.c,v 1.54 2008/07/16 23:59:23 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -51,11 +51,13 @@ static stp_image_status_t Image_get_row(stp_image_t *image,
 					unsigned char *data,
 					size_t byte_limit, int row);
 static int Image_height(stp_image_t *image);
+static void Image_reset(stp_image_t *image);
 static int Image_width(stp_image_t *image);
+static int Image_is_valid = 0;
 static stp_image_t theImage =
 {
   Image_init,
-  NULL,				/* reset */
+  Image_reset,
   Image_width,
   Image_height,
   Image_get_row,
@@ -63,7 +65,7 @@ static stp_image_t theImage =
   Image_conclude,
   NULL
 };
-stp_vars_t *global_vars;
+stp_vars_t *global_vars = NULL;
 
 double global_levels[STP_CHANNEL_LIMIT];
 double global_gammas[STP_CHANNEL_LIMIT];
@@ -89,7 +91,12 @@ int global_use_raw_cmyk;
 int global_did_something;
 int global_noscale = 0;
 int global_suppress_output = 0;
+int global_quiet = 0;
 char *global_output = NULL;
+FILE *output = NULL;
+int write_to_process = 0;
+int start_job = 0;
+int end_job = 0;
 
 static testpattern_t *static_testpatterns;
 
@@ -182,6 +189,19 @@ writefunc(void *file, const char *buf, size_t bytes)
     }
 }
 
+void
+close_output(void)
+{
+  if (output && output != stdout)
+    {
+      if (write_to_process)
+	(void) pclose(output);
+      else
+	(void) fclose(output);
+      output = NULL;
+    }
+}
+
 static void
 initialize_global_parameters(void)
 {
@@ -222,6 +242,8 @@ initialize_global_parameters(void)
   if (global_printer)
     free(global_printer); /* Allocated with strdup() */
   global_printer = NULL;
+  start_job = 0;
+  end_job = 0;
 }
 
 static int
@@ -237,8 +259,6 @@ do_print(void)
   int count;
   int i;
   char tmp[32];
-  FILE *output = stdout;
-  int write_to_process = 0;
 
   initialize_global_parameters();
   global_vars = stp_vars_create();
@@ -279,6 +299,7 @@ do_print(void)
 	output = NULL;
       else if (global_output[0] == '|')
 	{
+	  close_output();
 	  write_to_process = 1;
 	  output = popen(global_output+1, "w");
 	  if (! output)
@@ -291,6 +312,7 @@ do_print(void)
 	}
       else
 	{
+	  close_output();
 	  output = fopen(global_output, "wb");
 	  if (! output)
 	    {
@@ -301,8 +323,6 @@ do_print(void)
 	  global_output = NULL;
 	}
     }
-  else
-    output = stdout;
   stp_set_printer_defaults(v, the_printer);
   stp_set_outfunc(v, writefunc);
   stp_set_errfunc(v, writefunc);
@@ -339,6 +359,18 @@ do_print(void)
 	  int val = stp_get_int_parameter(global_vars, p->name);
 	  stp_set_int_parameter(v, p->name, val);
 	}
+      else if (p->p_type == STP_PARAMETER_TYPE_BOOLEAN &&
+	       stp_check_boolean_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
+	{
+	  int val = stp_get_boolean_parameter(global_vars, p->name);
+	  stp_set_boolean_parameter(v, p->name, val);
+	}
+      else if (p->p_type == STP_PARAMETER_TYPE_CURVE &&
+	       stp_check_curve_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
+	{
+	  const stp_curve_t *val = stp_get_curve_parameter(global_vars, p->name);
+	  stp_set_curve_parameter(v, p->name, val);
+	}
       else if (p->p_type == STP_PARAMETER_TYPE_DOUBLE &&
 	       stp_check_float_parameter(global_vars, p->name, STP_PARAMETER_ACTIVE))
 	{
@@ -349,6 +381,16 @@ do_print(void)
   stp_set_page_width(v, stp_get_page_width(global_vars));
   stp_set_page_height(v, stp_get_page_height(global_vars));
   stp_parameter_list_destroy(params);
+  if (stp_check_string_parameter(v, "PageSize", STP_PARAMETER_ACTIVE) &&
+      !strcmp(stp_get_string_parameter(v, "PageSize"), "Auto"))
+    {
+      stp_parameter_t desc;
+      stp_describe_parameter(v, "PageSize", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+	stp_set_string_parameter(v, "PageSize", desc.deflt.str);
+      stp_parameter_description_destroy(&desc);
+    }
+  stp_set_printer_defaults_soft(v, the_printer);
 
   stp_get_imageable_area(v, &left, &right, &bottom, &top);
   stp_describe_resolution(v, &x, &y);
@@ -379,18 +421,21 @@ do_print(void)
   stp_set_top(v, top);
 
   stp_merge_printvars(v, stp_printer_get_defaults(the_printer));
+  if (start_job)
+    {
+      stp_start_job(v, &theImage);
+      start_job = 0;
+    }
   if (stp_print(v, &theImage) != 1)
     return 2;
+  if (end_job)
+    {
+      stp_end_job(v, &theImage);
+      end_job = 0;
+    }
   stp_vars_destroy(v);
   stp_free(static_testpatterns);
   static_testpatterns = NULL;
-  if (output && output != stdout)
-    {
-      if (write_to_process)
-	(void) pclose(output);
-      else
-	(void) fclose(output);
-    }
   return 0;
 }
 
@@ -402,19 +447,24 @@ main(int argc, char **argv)
   int global_status = 0;
   while (1)
     {
-      c = getopt(argc, argv, "n");
+      c = getopt(argc, argv, "nq");
       if (c == -1)
 	break;
       switch (c)
 	{
 	case 'n':
 	  global_suppress_output = 1;
+	  break;
+	case 'q':
+	  global_quiet = 1;
+	  break;
 	default:
 	  break;
 	}
     }
 
   stp_init();
+  output = stdout;
   while (1)
     {
       status = do_print();
@@ -423,6 +473,7 @@ main(int argc, char **argv)
       else if (status != 0)
 	global_status = 1;
     }
+  close_output();
   return global_status;
 }
 
@@ -969,6 +1020,11 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 	      size_t byte_limit, int row)
 {
   int depth = global_channel_depth;
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_get_row with invalid image!\n");
+      abort();
+    }
   if (static_testpatterns[0].type == E_IMAGE)
     {
       testpattern_t *t = &(static_testpatterns[0]);
@@ -979,7 +1035,8 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 	  fprintf(stderr, "Read failed!\n");
 	  return STP_IMAGE_STATUS_ABORT;
 	}
-      fprintf(stderr, ".");
+      if (!global_quiet)
+	fprintf(stderr, ".");
     }
   else
     {
@@ -991,7 +1048,8 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 		       global_printer_width, global_steps, depth,
 		       global_bit_depth / 8);
 	  previous_band = band;
-	  fprintf(stderr, ".");
+	  if (!global_quiet)
+	    fprintf(stderr, ".");
 	}
       else if (row == global_printer_height - 1)
 	fill_black(data, global_printer_width, global_steps,
@@ -1005,7 +1063,8 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 		       global_printer_width, global_steps, depth,
 		       global_bit_depth / 8);
 	  previous_band = band;
-	  fprintf(stderr, ".");
+	  if (!global_quiet)
+	    fprintf(stderr, ".");
 	}
       else
 	fill_pattern(&(static_testpatterns[band]), data,
@@ -1018,6 +1077,11 @@ Image_get_row(stp_image_t *image, unsigned char *data,
 static int
 Image_width(stp_image_t *image)
 {
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_width with invalid image!\n");
+      abort();
+    }
   if (static_testpatterns[0].type == E_IMAGE)
     return static_testpatterns[0].d.image.x;
   else
@@ -1027,6 +1091,11 @@ Image_width(stp_image_t *image)
 static int
 Image_height(stp_image_t *image)
 {
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_height with invalid image!\n");
+      abort();
+    }
   if (static_testpatterns[0].type == E_IMAGE)
     return static_testpatterns[0].d.image.y;
   else
@@ -1036,17 +1105,46 @@ Image_height(stp_image_t *image)
 static void
 Image_init(stp_image_t *image)
 {
+  if (Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_init with already valid image!\n");
+      abort();
+    }
+  Image_is_valid = 1;
+ /* dummy function */
+}
+
+static void
+Image_reset(stp_image_t *image)
+{
+  if (!Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_reset with invalid image!\n");
+      abort();
+    }
  /* dummy function */
 }
 
 static void
 Image_conclude(stp_image_t *image)
 {
-  fprintf(stderr, "\n");
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_conclude with invalid image!\n");
+      abort();
+    }
+  Image_is_valid = 0;
+  if (!global_quiet)
+    fprintf(stderr, "\n");
 }
 
 static const char *
 Image_get_appname(stp_image_t *image)
 {
+  if (! Image_is_valid)
+    {
+      fprintf(stderr, "Calling Image_get_appname with invalid image!\n");
+      abort();
+    }
   return "Test Pattern";
 }
diff --git a/src/testpattern/testpattern.h b/src/testpattern/testpattern.h
index 3d3bbdc..b8c2b86 100644
--- a/src/testpattern/testpattern.h
+++ b/src/testpattern/testpattern.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.h,v 1.17 2008/01/27 21:44:21 rlk Exp $"
+ * "$Id: testpattern.h,v 1.19 2008/06/28 15:05:28 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -83,10 +83,14 @@ extern int global_did_something;
 extern int global_invert_data;
 extern int global_noscale;
 extern char *global_output;
-
+extern int global_quiet;
+extern FILE *output;
+extern int start_job;
+extern int end_job;
 
 extern char *c_strdup(const char *s);
 extern testpattern_t *get_next_testpattern(void);
+extern void close_output(void);
 
 typedef struct yylv {
   int ival;
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index be9bd04..167b521 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -361,8 +361,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 51
-#define YY_END_OF_BUFFER 52
+#define YY_NUM_RULES 54
+#define YY_END_OF_BUFFER 55
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -370,35 +370,37 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[249] =
+static yyconst flex_int16_t yy_accept[264] =
     {   0,
-        0,    0,   52,   51,   48,   50,   51,   49,   51,   51,
-       45,   45,   32,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   48,    0,   49,    0,   47,   45,
-       47,    0,   45,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,    0,   46,    0,   47,   46,
-       45,   47,   47,   37,   47,   47,   47,   44,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   36,   47,   20,   47,   47,   47,   47,   46,   47,
-       47,   34,    1,   47,   47,   47,   47,   39,   38,   29,
-       47,   47,   47,   35,   47,   47,   47,   21,   47,   47,
-       47,   33,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,    7,   47,   47,   47,   47,    9,   22,
-       27,   47,   47,   47,   47,   10,   47,   47,   47,   47,
-       47,   47,   47,   47,   11,   23,   40,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,    2,   47,   47,   47,
-       47,   41,   47,   47,   47,   47,   47,    5,   47,   30,
-
-       47,   19,   47,   47,    8,   47,    3,   42,   43,   47,
-       47,   25,   13,   47,   47,    6,   28,   47,   47,   47,
-       47,   26,   24,   12,    4,   31,   14,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   15,   47,
-       47,   47,   47,   18,   17,   47,   16,    0
+        0,    0,   55,   54,   51,   53,   54,   52,   54,   54,
+       48,   48,   33,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   51,    0,   52,    0,   50,   48,
+       50,    0,   48,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,    0,   49,    0,   50,   49,
+       48,   50,   50,   38,   50,   50,   50,   47,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   37,   50,   50,   21,   50,   50,   50,   50,   49,
+       50,   50,   35,    1,   50,   50,   50,   50,   50,   40,
+       39,   30,   50,   50,   50,   36,   50,   50,   50,   22,
+       50,   50,   50,   34,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,    7,   50,   50,   50,
+       50,   50,    9,   23,   28,   50,   50,   50,   50,   10,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   11,
+       24,   41,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,    2,   50,   50,   50,   50,   42,   50,   50,
+
+       50,   50,   50,   50,    5,   50,   31,   50,   20,   46,
+       50,   50,    8,   50,    3,   43,   44,   50,   50,   26,
+       13,   50,   50,   50,    6,   29,   50,   50,   50,   50,
+       50,   27,   25,   12,    4,   32,   14,   45,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   15,   50,   16,   50,   50,   50,   19,   18,
+       50,   17,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -411,12 +413,12 @@ static yyconst flex_int32_t yy_ec[256] =
        11,   11,   11,   11,   11,   11,   11,    1,   12,    1,
         1,    1,    1,    1,   14,   15,   16,   17,   18,   19,
        20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
-       23,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+       30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
         1,    1,    1,    1,   13,    1,   14,   15,   16,   17,
 
        18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-       28,   29,   23,   30,   31,   32,   33,   34,   35,   36,
-       37,   38,    1,    1,    1,    1,    1,    1,    1,    1,
+       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
+       38,   39,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -433,206 +435,214 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[39] =
+static yyconst flex_int32_t yy_meta[40] =
     {   0,
         1,    1,    2,    3,    1,    1,    1,    4,    4,    4,
         4,    1,    4,    4,    4,    4,    4,    4,    4,    4,
         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4
+        4,    4,    4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst flex_int16_t yy_base[253] =
+static yyconst flex_int16_t yy_base[268] =
     {   0,
-        0,    0,  516,  517,  513,  517,    0,    0,  508,   29,
-       32,   35,  517,  504,   38,   39,   43,   42,   40,   46,
-       48,   50,   49,   70,   55,   62,   71,   72,   64,   63,
-       73,   78,   77,   84,  510,  507,    0,  504,  517,   98,
-      500,   79,  101,  113,  104,   91,  116,   94,  118,  108,
-      109,  117,  119,  120,  126,  128,  124,  130,  132,  140,
-      133,  144,  134,  151,  138,  148,  152,  153,  161,  165,
-      150,  164,  168,  178,  169,  188,  190,  178,  193,  196,
-      200,  203,  154,  204,  188,  205,  162,  499,  207,  208,
-      209,  211,  212,  213,  215,  217,  218,  222,  223,  224,
-
-      227,  231,  232,  230,  234,  228,  233,  236,  244,  247,
-      248,  498,  254,  497,  255,  256,  257,  259,  259,  258,
-      263,  496,  495,  262,  264,  265,  267,  494,  493,  492,
-      276,  282,  271,  491,  288,  289,  286,  490,  290,  292,
-      295,  489,  296,  298,  299,  302,  304,  305,  307,  308,
-      309,  311,  312,  314,  315,  316,  320,  325,  488,  487,
-      486,  323,  335,  321,  337,  485,  326,  327,  340,  341,
-      344,  345,  347,  348,  484,  483,  482,  350,  351,  352,
-      353,  355,  358,  361,  362,  360,  481,  363,  367,  371,
-      373,  480,  376,  378,  384,  383,  385,  479,  387,  478,
-
-      388,  477,  390,  394,  476,  392,  475,  468,  465,  391,
-      399,  461,  458,  393,  400,  457,  450,  395,  412,  410,
-      403,  447,  446,  397,  396,  269,  421,  416,  413,  427,
-      422,  428,  431,  430,  432,  433,  434,  436,  268,  435,
-      444,  439,  442,  182,  176,  445,   88,  517,  471,  475,
-      479,   90
+        0,    0,  547,  548,  544,  548,    0,    0,  539,   30,
+       33,   36,  548,  535,   39,   40,   44,   46,   49,   43,
+       41,   56,   68,   70,   62,   51,   60,   67,   73,   80,
+       83,   84,   85,   86,  541,  538,    0,  535,  548,   91,
+      531,   86,  101,  113,  107,  116,  117,   90,  118,   98,
+      120,  124,  104,  125,  126,  130,  129,  133,  136,  140,
+      141,  144,  137,  150,  145,  149,  152,  156,  159,  161,
+      162,  164,  171,  175,  172,  188,  190,  177,  193,  196,
+      200,  203,  204,  205,  206,  207,  185,  209,  212,  211,
+      154,  214,  215,  217,  218,  226,  219,  225,  227,  231,
+
+      233,  235,  237,  232,  240,  238,  234,  242,  253,  239,
+      250,  530,  252,  259,  529,  260,  261,  262,  264,  264,
+      267,  269,  528,  527,  272,  270,  275,  273,  271,  526,
+      525,  524,  284,  292,  278,  523,  295,  297,  296,  522,
+      298,  281,  303,  521,  304,  305,  306,  311,  312,  313,
+      315,  317,  316,  318,  319,  322,  320,  323,  326,  324,
+      331,  338,  520,  519,  518,  334,  344,  335,  345,  517,
+      333,  349,  352,  355,  358,  356,  361,  362,  359,  516,
+      515,  514,  364,  366,  367,  369,  370,  372,  376,  375,
+      374,  377,  513,  378,  390,  388,  394,  512,  386,  387,
+
+      398,  400,  404,  402,  511,  405,  510,  406,  503,  500,
+      407,  408,  495,  410,  494,  493,  492,  409,  417,  491,
+      489,  412,  414,  419,  488,  487,  413,  420,  427,  429,
+      435,  486,  485,  484,  483,  482,  438,  457,  452,  430,
+      443,  440,  445,  446,  447,  450,  448,  453,  454,  444,
+      455,  464,  329,  461,  277,  471,  473,  478,  181,   94,
+      479,   50,  548,  506,  510,  514,   52
     } ;
 
-static yyconst flex_int16_t yy_def[253] =
+static yyconst flex_int16_t yy_def[268] =
     {   0,
-      248,    1,  248,  248,  248,  248,  249,  250,  251,  248,
-      252,  252,  248,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  248,  249,  250,  251,  248,  248,
-      252,  248,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  248,  248,  248,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  248,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
-      252,  252,  252,  252,  252,  252,  252,    0,  248,  248,
-      248,  248
+      263,    1,  263,  263,  263,  263,  264,  265,  266,  263,
+      267,  267,  263,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  263,  264,  265,  266,  263,  263,
+      267,  263,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  263,  263,  263,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  263,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,    0,  263,  263,  263,  263
     } ;
 
-static yyconst flex_int16_t yy_nxt[556] =
+static yyconst flex_int16_t yy_nxt[588] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        12,   13,   14,   14,   15,   16,   17,   18,   14,   19,
-       20,   21,   14,   22,   23,   24,   25,   26,   27,   28,
-       29,   30,   14,   31,   32,   33,   34,   14,   40,   40,
-       42,   43,   43,   42,   43,   43,  248,  248,  248,   44,
-      248,  248,   44,   54,  248,   50,  248,  248,  248,   47,
-       51,   60,   46,  248,   48,   59,   61,   45,   52,   55,
-      248,  248,  248,   57,   58,   49,   56,   53,  248,  248,
-      248,  248,   65,   62,   67,  248,  248,   63,   77,   77,
-       71,   69,  248,   41,   66,   70,  248,   64,   73,  248,
-
-       68,   75,  248,   72,   82,   74,   42,   40,   40,   42,
-       43,   43,  248,   81,   81,   76,  248,  248,   44,   78,
-       79,  248,   80,   80,  248,  248,  248,  248,  248,   83,
-       84,   85,  248,   88,  248,   87,  248,   95,  248,   91,
-      248,  248,  248,   92,   86,   90,  248,   93,  248,   94,
-       89,  101,  248,   96,   98,   99,  248,   97,  248,  248,
-      248,  248,  248,  103,  104,  100,  102,  105,  106,  248,
-      248,  108,  248,  248,  111,  112,  248,  248,  114,  107,
-      121,  109,  113,  110,  248,  115,  248,  119,  119,  116,
-      248,  117,  125,  118,   78,   78,  248,  119,  119,   77,
-
-       77,  248,   80,   80,  248,   80,   80,   76,  248,   81,
-       81,  248,  248,  248,  123,  248,  248,  248,  120,  248,
-      248,  248,  124,  248,  126,  248,  248,  122,  130,  133,
-      248,  248,  248,  127,  132,  248,  248,  137,  248,  248,
-      248,  248,  248,  143,  248,  128,  135,  129,  139,  140,
-      131,  142,  248,  145,  134,  248,  248,  146,  138,  136,
-      141,  144,  248,  248,  248,  248,  248,  248,  119,  119,
-      248,  248,  248,  248,  148,  248,  248,  248,  147,  248,
-      159,  154,  149,  153,  248,  157,  156,  151,  152,  155,
-      248,  158,  150,  160,  248,  162,  248,  248,  248,  161,
-
-      248,  163,  164,  248,  248,  165,  248,  248,  168,  169,
-      248,  171,  248,  248,  166,  248,  248,  248,  167,  248,
-      248,  173,  248,  248,  248,  176,  177,  172,  248,  248,
-      170,  248,  181,  248,  248,  248,  174,  175,  180,  179,
-      182,  184,  178,  248,  185,  248,  190,  187,  248,  248,
-      186,  183,  248,  248,  188,  248,  248,  189,  248,  248,
-      248,  248,  194,  248,  191,  196,  248,  197,  248,  248,
-      248,  248,  192,  199,  193,  248,  195,  200,  203,  248,
-      207,  248,  201,  205,  248,  198,  248,  204,  208,  206,
-      209,  248,  248,  248,  202,  248,  248,  210,  248,  248,
-
-      248,  248,  248,  248,  248,  248,  217,  248,  248,  211,
-      212,  248,  213,  215,  214,  218,  221,  223,  248,  222,
-      248,  248,  216,  219,  248,  225,  224,  226,  220,  248,
-      248,  229,  227,  228,  230,  248,  248,  231,  248,  248,
-      248,  248,  248,  248,  248,  233,  232,  248,  235,  242,
-      248,  234,  248,  248,  248,  248,  243,  238,  248,  236,
-      237,  244,  240,  239,  247,  248,  248,  241,  246,  248,
-      245,   36,   36,  248,   36,   37,  248,   37,   37,   38,
-       38,   38,   38,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-
-      248,  248,  248,  248,  248,  248,  248,  248,  248,   39,
-       39,   35,  248,   39,   35,  248,    3,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248
+       20,   21,   14,   22,   23,   24,   25,   26,   27,   14,
+       28,   29,   30,   14,   31,   32,   33,   34,   14,   40,
+       40,   42,   43,   43,   42,   43,   43,  263,  263,  263,
+       44,  263,  263,   44,  263,   41,   50,  263,  263,  263,
+       47,   51,   54,   46,  263,   48,   57,   58,  263,   45,
+      263,   59,   52,   67,   56,  263,  263,   49,  263,   55,
+       60,  263,   53,   62,   66,   61,   69,   63,  263,   65,
+       68,  263,  263,  263,  263,   77,   77,   64,  263,   42,
+
+       40,   40,  263,   75,   73,   70,  263,   71,   76,   42,
+       43,   43,  263,   74,   72,  263,   81,   81,   44,   78,
+       79,  263,   80,   80,  263,  263,  263,   84,  263,   82,
+       83,   85,  263,  263,  263,   86,   89,  263,  263,   91,
+       88,  263,   95,   92,  263,  263,   87,   93,  263,  263,
+       90,   94,  263,  263,   98,   99,   96,  263,  263,  101,
+      263,   97,  263,  103,  263,  100,  105,  263,  104,  263,
+      263,  108,  263,  112,  113,  102,  106,  111,  114,  263,
+      263,  107,  109,  263,  110,  116,  120,  120,  118,  263,
+      115,  130,  117,  263,   78,   78,  119,  120,  120,   77,
+
+       77,  263,   80,   80,  263,   80,   80,   76,  263,   81,
+       81,  263,  263,  263,  263,  263,  126,  263,  121,  263,
+      263,  127,  263,  263,  125,  263,  263,  263,  123,  128,
+      122,  132,  124,  263,  263,  263,  129,  134,  135,  263,
+      263,  263,  263,  263,  139,  263,  263,  263,  263,  137,
+      263,  131,  141,  145,  142,  133,  136,  144,  263,  147,
+      263,  263,  146,  143,  138,  140,  148,  263,  263,  263,
+      263,  149,  263,  120,  120,  263,  150,  263,  263,  263,
+      263,  263,  151,  263,  163,  263,  263,  152,  156,  263,
+      157,  160,  263,  154,  155,  158,  159,  161,  153,  162,
+
+      263,  164,  166,  263,  263,  263,  263,  171,  167,  165,
+      168,  263,  263,  263,  263,  169,  172,  173,  175,  263,
+      263,  263,  170,  263,  263,  263,  263,  263,  263,  177,
+      263,  263,  263,  181,  263,  182,  176,  263,  174,  263,
+      186,  263,  263,  263,  185,  178,  263,  179,  180,  184,
+      187,  183,  263,  263,  190,  191,  188,  263,  189,  192,
+      263,  193,  194,  263,  263,  195,  263,  263,  196,  263,
+      263,  203,  263,  200,  263,  263,  197,  263,  263,  202,
+      263,  204,  263,  263,  263,  263,  263,  198,  206,  199,
+      210,  201,  211,  207,  263,  263,  263,  208,  263,  212,
+
+      213,  205,  263,  215,  214,  216,  263,  218,  263,  209,
+      263,  217,  263,  263,  263,  263,  263,  263,  263,  219,
+      263,  263,  263,  226,  220,  263,  222,  263,  263,  227,
+      221,  224,  223,  235,  230,  263,  233,  263,  263,  231,
+      232,  225,  228,  263,  236,  234,  263,  229,  263,  238,
+      239,  263,  263,  263,  263,  263,  263,  245,  263,  237,
+      263,  263,  263,  263,  247,  263,  240,  241,  255,  263,
+      242,  248,  263,  243,  250,  252,  246,  257,  249,  263,
+      251,  263,  258,  244,  254,  253,  263,  263,  259,  256,
+      263,  263,  263,  263,  263,  263,  263,  263,  262,  263,
+
+      263,  263,  263,  263,  261,  260,   36,   36,  263,   36,
+       37,  263,   37,   37,   38,   38,   38,   38,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+       39,   39,   35,  263,   39,   35,  263,    3,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263
     } ;
 
-static yyconst flex_int16_t yy_chk[556] =
+static yyconst flex_int16_t yy_chk[588] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,   10,   10,
-       11,   11,   11,   12,   12,   12,   15,   16,   19,   11,
-       18,   17,   12,   19,   20,   17,   21,   23,   22,   16,
-       17,   23,   15,   25,   16,   22,   23,   11,   18,   19,
-       26,   30,   29,   21,   21,   16,   20,   18,   24,   27,
-       28,   31,   25,   24,   27,   33,   32,   24,   42,   42,
-       30,   28,   34,  252,   26,   29,  247,   24,   32,   46,
-
-       27,   34,   48,   31,   46,   33,   40,   40,   40,   43,
-       43,   43,   45,   45,   45,   40,   50,   51,   43,   44,
-       44,   44,   44,   44,   47,   52,   49,   53,   54,   47,
-       48,   49,   57,   52,   55,   51,   56,   57,   58,   55,
-       59,   61,   63,   55,   50,   54,   65,   55,   60,   56,
-       53,   61,   62,   58,   60,   60,   66,   59,   71,   64,
-       67,   68,   83,   62,   63,   60,   61,   64,   65,   69,
-       87,   67,   72,   70,   68,   69,   73,   75,   71,   66,
-       83,   67,   70,   67,  245,   72,   74,   78,   78,   73,
-      244,   74,   87,   75,   76,   76,   85,   76,   76,   77,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,   10,
+       10,   11,   11,   11,   12,   12,   12,   15,   16,   21,
+       11,   20,   17,   12,   18,  267,   17,   19,  262,   26,
+       16,   17,   19,   15,   22,   16,   21,   21,   27,   11,
+       25,   22,   18,   27,   20,   28,   23,   16,   24,   19,
+       23,   29,   18,   24,   26,   23,   28,   24,   30,   25,
+       27,   31,   32,   33,   34,   42,   42,   24,   48,   40,
+
+       40,   40,  260,   34,   32,   29,   50,   30,   40,   43,
+       43,   43,   53,   33,   31,   45,   45,   45,   43,   44,
+       44,   44,   44,   44,   46,   47,   49,   48,   51,   46,
+       47,   49,   52,   54,   55,   50,   53,   57,   56,   55,
+       52,   58,   57,   55,   59,   63,   51,   55,   60,   61,
+       54,   56,   62,   65,   60,   60,   58,   66,   64,   61,
+       67,   59,   91,   62,   68,   60,   64,   69,   63,   70,
+       71,   67,   72,   69,   70,   61,   65,   68,   70,   73,
+       75,   66,   67,   74,   67,   72,   78,   78,   74,  259,
+       71,   91,   73,   87,   76,   76,   75,   76,   76,   77,
 
        77,   79,   79,   79,   80,   80,   80,   77,   81,   81,
-       81,   82,   84,   86,   85,   89,   90,   91,   82,   92,
-       93,   94,   86,   95,   89,   96,   97,   84,   93,   96,
-       98,   99,  100,   90,   95,  101,  106,  100,  104,  102,
-      103,  107,  105,  106,  108,   91,   98,   92,  102,  103,
-       94,  105,  109,  108,   97,  110,  111,  109,  101,   99,
-      104,  107,  113,  115,  116,  117,  120,  118,  119,  119,
-      124,  121,  125,  126,  111,  127,  239,  226,  110,  133,
-      127,  120,  113,  118,  131,  125,  124,  116,  117,  121,
-      132,  126,  115,  131,  137,  133,  135,  136,  139,  132,
-
-      140,  135,  136,  141,  143,  137,  144,  145,  141,  143,
-      146,  145,  147,  148,  139,  149,  150,  151,  140,  152,
-      153,  147,  154,  155,  156,  150,  151,  146,  157,  164,
-      144,  162,  155,  158,  167,  168,  148,  149,  154,  153,
-      156,  158,  152,  163,  162,  165,  168,  164,  169,  170,
-      163,  157,  171,  172,  165,  173,  174,  167,  178,  179,
-      180,  181,  172,  182,  169,  174,  183,  178,  186,  184,
-      185,  188,  170,  180,  171,  189,  173,  181,  184,  190,
-      189,  191,  182,  186,  193,  179,  194,  185,  190,  188,
-      191,  196,  195,  197,  183,  199,  201,  193,  203,  210,
-
-      206,  214,  204,  218,  225,  224,  203,  211,  215,  194,
-      195,  221,  196,  199,  197,  204,  211,  215,  220,  214,
-      219,  229,  201,  206,  228,  219,  218,  220,  210,  227,
-      231,  228,  221,  227,  228,  230,  232,  228,  234,  233,
-      235,  236,  237,  240,  238,  229,  228,  242,  231,  238,
-      243,  230,  241,  246,  223,  222,  240,  234,  217,  232,
-      233,  241,  236,  235,  246,  216,  213,  237,  243,  212,
-      242,  249,  249,  209,  249,  250,  208,  250,  250,  251,
-      251,  251,  251,  207,  205,  202,  200,  198,  192,  187,
-      177,  176,  175,  166,  161,  160,  159,  142,  138,  134,
-
-      130,  129,  128,  123,  122,  114,  112,   88,   41,   38,
-       36,   35,   14,    9,    5,    3,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  248,  248
+       81,   82,   83,   84,   85,   86,   87,   88,   82,   90,
+       89,   88,   92,   93,   86,   94,   95,   97,   84,   89,
+       83,   93,   85,   98,   96,   99,   90,   95,   96,  100,
+      104,  101,  107,  102,  100,  103,  106,  110,  105,   98,
+      108,   92,  102,  106,  103,   94,   97,  105,  111,  108,
+      113,  109,  107,  104,   99,  101,  109,  114,  116,  117,
+      118,  110,  119,  120,  120,  121,  111,  122,  126,  129,
+      125,  128,  113,  127,  129,  255,  135,  114,  119,  142,
+      121,  126,  133,  117,  118,  122,  125,  127,  116,  128,
+
+      134,  133,  135,  137,  139,  138,  141,  142,  137,  134,
+      138,  143,  145,  146,  147,  139,  143,  145,  147,  148,
+      149,  150,  141,  151,  153,  152,  154,  155,  157,  149,
+      156,  158,  160,  153,  159,  154,  148,  253,  146,  161,
+      158,  171,  166,  168,  157,  150,  162,  151,  152,  156,
+      159,  155,  167,  169,  162,  166,  160,  172,  161,  167,
+      173,  168,  169,  174,  176,  171,  175,  179,  172,  177,
+      178,  179,  183,  176,  184,  185,  173,  186,  187,  178,
+      188,  183,  191,  190,  189,  192,  194,  174,  185,  175,
+      189,  177,  190,  186,  199,  200,  196,  187,  195,  191,
+
+      192,  184,  197,  195,  194,  196,  201,  199,  202,  188,
+      204,  197,  203,  206,  208,  211,  212,  218,  214,  200,
+      222,  227,  223,  211,  201,  219,  203,  224,  228,  212,
+      202,  206,  204,  228,  219,  229,  224,  230,  240,  222,
+      223,  208,  214,  231,  229,  227,  237,  218,  242,  231,
+      237,  241,  250,  243,  244,  245,  247,  240,  246,  230,
+      239,  248,  249,  251,  242,  238,  239,  239,  250,  254,
+      239,  243,  252,  239,  245,  247,  241,  252,  244,  256,
+      246,  257,  254,  239,  249,  248,  258,  261,  256,  251,
+      236,  235,  234,  233,  232,  226,  225,  221,  261,  220,
+
+      217,  216,  215,  213,  258,  257,  264,  264,  210,  264,
+      265,  209,  265,  265,  266,  266,  266,  266,  207,  205,
+      198,  193,  182,  181,  180,  170,  165,  164,  163,  144,
+      140,  136,  132,  131,  130,  124,  123,  115,  112,   41,
+       38,   36,   35,   14,    9,    5,    3,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,  263,  263,  263,  263,  263
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -651,7 +661,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "testpatternl.l"
 /*
- * "$Id: testpatternl.l,v 1.20 2008/02/03 02:48:20 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -711,7 +721,7 @@ do							\
  while (0)
 
 
-#line 715 "testpatternl.c"
+#line 725 "testpatternl.c"
 
 #define INITIAL 0
 
@@ -867,7 +877,7 @@ YY_DECL
 #line 73 "testpatternl.l"
 
 
-#line 871 "testpatternl.c"
+#line 881 "testpatternl.c"
 
 	if ( !(yy_init) )
 		{
@@ -920,13 +930,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 249 )
+				if ( yy_current_state >= 264 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 517 );
+		while ( yy_base[yy_current_state] != 548 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1028,117 +1038,117 @@ DBG(PARAMETER_INT); return PARAMETER_INT;
 case 16:
 YY_RULE_SETUP
 #line 90 "testpatternl.l"
-DBG(PARAMETER); return PARAMETER;
+DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
 #line 91 "testpatternl.l"
-DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
+DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
 #line 92 "testpatternl.l"
-DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
+DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 93 "testpatternl.l"
-DBG(DENSITY); return DENSITY;
+DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 94 "testpatternl.l"
-DBG(TOP); return TOP;
+DBG(DENSITY); return DENSITY;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 95 "testpatternl.l"
-DBG(LEFT); return LEFT;
+DBG(TOP); return TOP;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 96 "testpatternl.l"
-DBG(HSIZE); return HSIZE;
+DBG(LEFT); return LEFT;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 97 "testpatternl.l"
-DBG(VSIZE); return VSIZE;
+DBG(HSIZE); return HSIZE;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 98 "testpatternl.l"
-DBG(BLACKLINE); return BLACKLINE;
+DBG(VSIZE); return VSIZE;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 99 "testpatternl.l"
-DBG(PATTERN); return PATTERN;
+DBG(BLACKLINE); return BLACKLINE;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 100 "testpatternl.l"
-DBG(XPATTERN); return XPATTERN;
+DBG(PATTERN); return PATTERN;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 101 "testpatternl.l"
-DBG(IMAGE); return IMAGE;
+DBG(XPATTERN); return XPATTERN;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 102 "testpatternl.l"
-DBG(EXTENDED); return EXTENDED;
+DBG(IMAGE); return IMAGE;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 103 "testpatternl.l"
-DBG(GRID); return GRID;
+DBG(EXTENDED); return EXTENDED;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 104 "testpatternl.l"
-DBG(CHANNEL); return CHANNEL;
+DBG(GRID); return GRID;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 105 "testpatternl.l"
-DBG(PAGESIZE); return PAGESIZE;
+DBG(CHANNEL); return CHANNEL;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 106 "testpatternl.l"
-DBG(SEMI); return SEMI;
+DBG(PAGESIZE); return PAGESIZE;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 107 "testpatternl.l"
-DBG(MODE); return MODE;
+DBG(SEMI); return SEMI;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 108 "testpatternl.l"
-yylval.ival = CMYK;DBG(CMYK); return CMYK;
+DBG(MODE); return MODE;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 109 "testpatternl.l"
-yylval.ival = CMYK;DBG(KCMY); return KCMY;
+yylval.ival = CMYK;DBG(CMYK); return CMYK;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 110 "testpatternl.l"
-yylval.ival = RGB;DBG(RGB); return RGB;
+yylval.ival = CMYK;DBG(KCMY); return KCMY;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 111 "testpatternl.l"
-yylval.ival = RGB;DBG(CMY); return CMY;
+yylval.ival = RGB;DBG(RGB); return RGB;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 112 "testpatternl.l"
-yylval.ival = GRAY;DBG(GRAY); return GRAY;
+yylval.ival = RGB;DBG(CMY); return CMY;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
@@ -1148,66 +1158,81 @@ yylval.ival = GRAY;DBG(GRAY); return GRAY;
 case 40:
 YY_RULE_SETUP
 #line 114 "testpatternl.l"
-yylval.ival = WHITE;DBG(WHITE); return WHITE;
+yylval.ival = GRAY;DBG(GRAY); return GRAY;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 115 "testpatternl.l"
-DBG(OUTPUT); return OUTPUT;
+yylval.ival = WHITE;DBG(WHITE); return WHITE;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 116 "testpatternl.l"
-DBG(MESSAGE); return MESSAGE;
+DBG(OUTPUT); return OUTPUT;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 117 "testpatternl.l"
-DBG(NOSCALE); return NOSCALE;
+DBG(MESSAGE); return MESSAGE;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 118 "testpatternl.l"
-DBG(END); return END;
+DBG(NOSCALE); return NOSCALE;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 121 "testpatternl.l"
-yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
+#line 119 "testpatternl.l"
+DBG(START_JOB); return START_JOB;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 122 "testpatternl.l"
-yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
+#line 120 "testpatternl.l"
+DBG(END_JOB); return END_JOB;
 	YY_BREAK
 case 47:
-/* rule 47 can match eol */
 YY_RULE_SETUP
-#line 123 "testpatternl.l"
-yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
+#line 121 "testpatternl.l"
+DBG(END); return END;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 124 "testpatternl.l"
-DBG(whitespace); 	/* Skip blanks/tabs */
+yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 125 "testpatternl.l"
-DBG(comment); 	/* Skip comments */
+yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
 #line 126 "testpatternl.l"
-DBG(newline); mylineno++;
+yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 127 "testpatternl.l"
+DBG(whitespace); 	/* Skip blanks/tabs */
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 128 "testpatternl.l"
+DBG(comment); 	/* Skip comments */
+	YY_BREAK
+case 53:
+/* rule 53 can match eol */
+YY_RULE_SETUP
+#line 129 "testpatternl.l"
+DBG(newline); mylineno++;
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 130 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1211 "testpatternl.c"
+#line 1236 "testpatternl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1491,7 +1516,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 249 )
+			if ( yy_current_state >= 264 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1519,11 +1544,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 249 )
+		if ( yy_current_state >= 264 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 248);
+	yy_is_jam = (yy_current_state == 263);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2174,4 +2199,4 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 127 "testpatternl.l"
+#line 130 "testpatternl.l"
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
index 58dcfe2..a6894c9 100644
--- a/src/testpattern/testpatternl.l
+++ b/src/testpattern/testpatternl.l
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatternl.l,v 1.20 2008/02/03 02:48:20 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -87,6 +87,7 @@ ink_limit		DBG(INK_LIMIT); return INK_LIMIT;
 printer			DBG(PRINTER); return PRINTER;
 parameter		DBG(PARAMETER); return PARAMETER;
 parameter_int		DBG(PARAMETER_INT); return PARAMETER_INT;
+parameter_bool		DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
 parameter_string	DBG(PARAMETER); return PARAMETER;
 parameter_float		DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
 parameter_curve		DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
@@ -115,6 +116,8 @@ white			yylval.ival = WHITE;DBG(WHITE); return WHITE;
 output			DBG(OUTPUT); return OUTPUT;
 message			DBG(MESSAGE); return MESSAGE;
 noscale			DBG(NOSCALE); return NOSCALE;
+start_job		DBG(START_JOB); return START_JOB;
+end_job			DBG(END_JOB); return END_JOB;
 end			DBG(END); return END;
 
 
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index a7ea3dc..10fac48 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -84,34 +84,37 @@
      PRINTER = 273,
      PARAMETER = 274,
      PARAMETER_INT = 275,
-     PARAMETER_FLOAT = 276,
-     PARAMETER_CURVE = 277,
-     DENSITY = 278,
-     TOP = 279,
-     LEFT = 280,
-     HSIZE = 281,
-     VSIZE = 282,
-     BLACKLINE = 283,
-     NOSCALE = 284,
-     PATTERN = 285,
-     XPATTERN = 286,
-     EXTENDED = 287,
-     IMAGE = 288,
-     GRID = 289,
-     SEMI = 290,
-     CHANNEL = 291,
-     CMYK = 292,
-     KCMY = 293,
-     RGB = 294,
-     CMY = 295,
-     GRAY = 296,
-     WHITE = 297,
-     RAW = 298,
-     MODE = 299,
-     PAGESIZE = 300,
-     MESSAGE = 301,
-     OUTPUT = 302,
-     END = 303
+     PARAMETER_BOOL = 276,
+     PARAMETER_FLOAT = 277,
+     PARAMETER_CURVE = 278,
+     DENSITY = 279,
+     TOP = 280,
+     LEFT = 281,
+     HSIZE = 282,
+     VSIZE = 283,
+     BLACKLINE = 284,
+     NOSCALE = 285,
+     PATTERN = 286,
+     XPATTERN = 287,
+     EXTENDED = 288,
+     IMAGE = 289,
+     GRID = 290,
+     SEMI = 291,
+     CHANNEL = 292,
+     CMYK = 293,
+     KCMY = 294,
+     RGB = 295,
+     CMY = 296,
+     GRAY = 297,
+     WHITE = 298,
+     RAW = 299,
+     MODE = 300,
+     PAGESIZE = 301,
+     MESSAGE = 302,
+     OUTPUT = 303,
+     START_JOB = 304,
+     END_JOB = 305,
+     END = 306
    };
 #endif
 /* Tokens.  */
@@ -133,34 +136,37 @@
 #define PRINTER 273
 #define PARAMETER 274
 #define PARAMETER_INT 275
-#define PARAMETER_FLOAT 276
-#define PARAMETER_CURVE 277
-#define DENSITY 278
-#define TOP 279
-#define LEFT 280
-#define HSIZE 281
-#define VSIZE 282
-#define BLACKLINE 283
-#define NOSCALE 284
-#define PATTERN 285
-#define XPATTERN 286
-#define EXTENDED 287
-#define IMAGE 288
-#define GRID 289
-#define SEMI 290
-#define CHANNEL 291
-#define CMYK 292
-#define KCMY 293
-#define RGB 294
-#define CMY 295
-#define GRAY 296
-#define WHITE 297
-#define RAW 298
-#define MODE 299
-#define PAGESIZE 300
-#define MESSAGE 301
-#define OUTPUT 302
-#define END 303
+#define PARAMETER_BOOL 276
+#define PARAMETER_FLOAT 277
+#define PARAMETER_CURVE 278
+#define DENSITY 279
+#define TOP 280
+#define LEFT 281
+#define HSIZE 282
+#define VSIZE 283
+#define BLACKLINE 284
+#define NOSCALE 285
+#define PATTERN 286
+#define XPATTERN 287
+#define EXTENDED 288
+#define IMAGE 289
+#define GRID 290
+#define SEMI 291
+#define CHANNEL 292
+#define CMYK 293
+#define KCMY 294
+#define RGB 295
+#define CMY 296
+#define GRAY 297
+#define WHITE 298
+#define RAW 299
+#define MODE 300
+#define PAGESIZE 301
+#define MESSAGE 302
+#define OUTPUT 303
+#define START_JOB 304
+#define END_JOB 305
+#define END 306
 
 
 
@@ -264,7 +270,7 @@ typedef int YYSTYPE;
 
 
 /* Line 216 of yacc.c.  */
-#line 268 "testpatterny.c"
+#line 274 "testpatterny.c"
 
 #ifdef short
 # undef short
@@ -477,22 +483,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  61
+#define YYFINAL  67
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   178
+#define YYLAST   186
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  49
+#define YYNTOKENS  52
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  72
+#define YYNNTS  75
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  127
+#define YYNRULES  133
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  185
+#define YYNSTATES  193
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   303
+#define YYMAXUTOK   306
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -530,7 +536,7 @@ static const yytype_uint8 yytranslate[] =
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48
+      45,    46,    47,    48,    49,    50,    51
 };
 
 #if YYDEBUG
@@ -542,72 +548,75 @@ static const yytype_uint16 yyprhs[] =
       19,    21,    23,    26,    29,    32,    35,    38,    41,    45,
       47,    49,    51,    53,    55,    57,    59,    62,    66,    70,
       74,    78,    81,    84,    87,    90,    93,    97,    99,   101,
-     105,   109,   113,   117,   119,   121,   123,   125,   128,   131,
-     134,   137,   140,   143,   146,   150,   152,   155,   156,   158,
-     161,   166,   172,   174,   176,   178,   181,   182,   184,   186,
-     188,   194,   198,   201,   204,   208,   211,   215,   220,   226,
-     233,   235,   237,   239,   241,   243,   245,   247,   250,   252,
-     254,   256,   258,   260,   262,   264,   266,   268,   270,   272,
-     274,   276,   278,   280,   282,   284,   286,   288,   290,   292,
-     294,   296,   299,   301,   303,   305,   307,   310,   311,   314,
-     316,   317,   320,   322,   324,   325,   328,   329
+     105,   109,   113,   117,   121,   123,   125,   127,   129,   131,
+     134,   137,   140,   143,   146,   149,   152,   156,   158,   161,
+     162,   164,   167,   172,   178,   180,   182,   184,   187,   188,
+     190,   192,   194,   200,   204,   207,   210,   214,   217,   221,
+     226,   232,   239,   241,   243,   245,   247,   249,   251,   253,
+     256,   258,   260,   262,   264,   266,   268,   270,   272,   274,
+     276,   278,   280,   282,   284,   286,   288,   290,   292,   294,
+     296,   298,   300,   302,   304,   306,   308,   310,   313,   315,
+     317,   319,   321,   324,   325,   328,   330,   331,   334,   336,
+     338,   339,   342,   343
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-     119,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
+     125,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
       -1,    10,    -1,    11,    -1,    12,    -1,    13,    -1,     4,
-      -1,     3,    -1,    37,     3,    -1,    38,     3,    -1,    39,
-       3,    -1,    40,     3,    -1,    41,     3,    -1,    42,     3,
-      -1,    32,     3,     3,    -1,    52,    -1,    53,    -1,    54,
-      -1,    55,    -1,    56,    -1,    57,    -1,    58,    -1,    44,
-      59,    -1,    15,    50,    51,    -1,    15,     3,    51,    -1,
-      14,    50,    51,    -1,    14,     3,    51,    -1,    14,    51,
-      -1,    16,     3,    -1,    17,    51,    -1,    18,     5,    -1,
-      45,     5,    -1,    45,     3,     3,    -1,    69,    -1,    70,
+      -1,     3,    -1,    38,     3,    -1,    39,     3,    -1,    40,
+       3,    -1,    41,     3,    -1,    42,     3,    -1,    43,     3,
+      -1,    33,     3,     3,    -1,    55,    -1,    56,    -1,    57,
+      -1,    58,    -1,    59,    -1,    60,    -1,    61,    -1,    45,
+      62,    -1,    15,    53,    54,    -1,    15,     3,    54,    -1,
+      14,    53,    54,    -1,    14,     3,    54,    -1,    14,    54,
+      -1,    16,     3,    -1,    17,    54,    -1,    18,     5,    -1,
+      46,     5,    -1,    46,     3,     3,    -1,    72,    -1,    73,
       -1,    19,     5,     5,    -1,    20,     5,     3,    -1,    21,
-       5,    51,    -1,    22,     5,     5,    -1,    72,    -1,    73,
-      -1,    74,    -1,    75,    -1,    23,    51,    -1,    24,    51,
-      -1,    25,    51,    -1,    26,    51,    -1,    27,    51,    -1,
-      28,     3,    -1,    29,     3,    -1,    51,    51,    51,    -1,
-      84,    -1,    85,    84,    -1,    -1,    85,    -1,    84,    86,
-      -1,    50,    51,    51,    51,    -1,    36,     3,    51,    51,
-      51,    -1,    88,    -1,    89,    -1,    90,    -1,    91,    90,
-      -1,    -1,    91,    -1,    87,    -1,    92,    -1,    51,    51,
-      51,    51,    51,    -1,    30,    94,    93,    -1,    31,    93,
-      -1,    34,     3,    -1,    33,     3,     3,    -1,    46,     5,
-      -1,    46,     5,     5,    -1,    46,     5,     5,     5,    -1,
-      46,     5,     5,     5,     5,    -1,    46,     5,     5,     5,
-       5,     5,    -1,    99,    -1,   100,    -1,   101,    -1,   102,
-      -1,   103,    -1,   104,    -1,    47,    -1,    47,     5,    -1,
-     106,    -1,   107,    -1,   108,    -1,    63,    -1,    64,    -1,
-      61,    -1,    62,    -1,    65,    -1,    66,    -1,    67,    -1,
-      68,    -1,    76,    -1,    77,    -1,    78,    -1,    79,    -1,
-      80,    -1,    81,    -1,    82,    -1,    83,    -1,    60,    -1,
-      71,    -1,   105,    -1,   109,    -1,   110,    35,    -1,    95,
-      -1,    96,    -1,    97,    -1,   105,    -1,   112,    35,    -1,
-      -1,   114,   113,    -1,    98,    -1,    -1,   116,   111,    -1,
-     114,    -1,   115,    -1,    -1,    48,    35,    -1,    -1,   116,
-     120,   117,   118,    -1
+       5,     3,    -1,    22,     5,    54,    -1,    23,     5,     5,
+      -1,    75,    -1,    76,    -1,    78,    -1,    79,    -1,    77,
+      -1,    24,    54,    -1,    25,    54,    -1,    26,    54,    -1,
+      27,    54,    -1,    28,    54,    -1,    29,     3,    -1,    30,
+       3,    -1,    54,    54,    54,    -1,    88,    -1,    89,    88,
+      -1,    -1,    89,    -1,    88,    90,    -1,    53,    54,    54,
+      54,    -1,    37,     3,    54,    54,    54,    -1,    92,    -1,
+      93,    -1,    94,    -1,    95,    94,    -1,    -1,    95,    -1,
+      91,    -1,    96,    -1,    54,    54,    54,    54,    54,    -1,
+      31,    98,    97,    -1,    32,    97,    -1,    35,     3,    -1,
+      34,     3,     3,    -1,    47,     5,    -1,    47,     5,     5,
+      -1,    47,     5,     5,     5,    -1,    47,     5,     5,     5,
+       5,    -1,    47,     5,     5,     5,     5,     5,    -1,   103,
+      -1,   104,    -1,   105,    -1,   106,    -1,   107,    -1,   108,
+      -1,    48,    -1,    48,     5,    -1,   110,    -1,   111,    -1,
+     112,    -1,    49,    -1,    50,    -1,    66,    -1,    67,    -1,
+      64,    -1,    65,    -1,    68,    -1,    69,    -1,    70,    -1,
+      71,    -1,    80,    -1,    81,    -1,    82,    -1,    83,    -1,
+      84,    -1,    85,    -1,    86,    -1,    87,    -1,    63,    -1,
+      74,    -1,   109,    -1,   113,    -1,   114,    -1,   115,    -1,
+     116,    36,    -1,    99,    -1,   100,    -1,   101,    -1,   109,
+      -1,   118,    36,    -1,    -1,   120,   119,    -1,   102,    -1,
+      -1,   122,   117,    -1,   120,    -1,   121,    -1,    -1,    51,
+      36,    -1,    -1,   122,   126,   123,   124,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   141,   141,   141,   141,   141,   142,   142,   142,   142,
-     144,   144,   147,   159,   171,   183,   195,   207,   219,   231,
-     231,   231,   231,   231,   231,   231,   234,   237,   247,   256,
-     266,   275,   282,   289,   296,   305,   314,   323,   323,   326,
-     336,   345,   354,   368,   368,   368,   368,   370,   377,   384,
-     391,   398,   405,   413,   421,   436,   436,   439,   439,   442,
-     445,   459,   472,   472,   475,   475,   478,   478,   481,   481,
-     484,   499,   502,   517,   528,   545,   551,   558,   566,   575,
-     586,   586,   586,   586,   586,   589,   592,   599,   604,   604,
-     607,   610,   610,   610,   610,   610,   610,   611,   611,   611,
-     611,   611,   611,   611,   612,   612,   612,   612,   612,   612,
-     612,   615,   619,   619,   619,   619,   622,   626,   626,   629,
-     633,   633,   636,   636,   639,   639,   644,   643
+       0,   144,   144,   144,   144,   144,   145,   145,   145,   145,
+     147,   147,   150,   162,   174,   186,   198,   210,   222,   234,
+     234,   234,   234,   234,   234,   234,   237,   240,   250,   259,
+     269,   278,   285,   292,   299,   308,   317,   326,   326,   329,
+     339,   348,   357,   366,   380,   380,   380,   380,   380,   382,
+     389,   396,   403,   410,   417,   425,   433,   448,   448,   451,
+     451,   454,   457,   471,   484,   484,   487,   487,   490,   490,
+     493,   493,   496,   511,   514,   529,   540,   557,   563,   570,
+     578,   587,   598,   598,   598,   598,   598,   601,   604,   613,
+     618,   618,   621,   624,   628,   632,   632,   632,   632,   632,
+     632,   633,   633,   633,   633,   633,   633,   633,   634,   634,
+     634,   634,   634,   634,   635,   635,   635,   638,   642,   642,
+     642,   642,   645,   649,   649,   652,   656,   656,   659,   659,
+     662,   662,   667,   666
 };
 #endif
 
@@ -619,25 +628,25 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN",
   "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK",
   "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER",
-  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE",
-  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "NOSCALE",
-  "PATTERN", "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL",
-  "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE",
-  "MESSAGE", "OUTPUT", "END", "$accept", "COLOR", "NUMBER", "cmykspec",
-  "kcmyspec", "rgbspec", "cmyspec", "grayspec", "whitespec",
-  "extendedspec", "modespec", "inputspec", "level", "channel_level",
-  "gamma", "channel_gamma", "global_gamma", "steps", "ink_limit",
-  "printer", "page_size_name", "page_size_custom", "page_size",
-  "parameter_string", "parameter_int", "parameter_float",
-  "parameter_curve", "parameter", "density", "top", "left", "hsize",
-  "vsize", "blackline", "noscale", "color_block1", "color_blocks1a",
-  "color_blocks1b", "color_blocks1", "color_block2a", "color_block2b",
-  "color_block2", "color_blocks2a", "color_blocks2", "color_blocks",
-  "patvars", "pattern", "xpattern", "grid", "image", "Message0",
-  "Message1", "Message2", "Message3", "Message4", "A_Message", "message",
-  "Output0", "Output1", "A_Output", "output", "A_Rule", "Rule",
-  "A_Pattern", "Pattern", "Patterns", "Image", "Rules", "Output", "EOF",
-  "Thing", "@1", 0
+  "PARAMETER", "PARAMETER_INT", "PARAMETER_BOOL", "PARAMETER_FLOAT",
+  "PARAMETER_CURVE", "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE",
+  "BLACKLINE", "NOSCALE", "PATTERN", "XPATTERN", "EXTENDED", "IMAGE",
+  "GRID", "SEMI", "CHANNEL", "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE",
+  "RAW", "MODE", "PAGESIZE", "MESSAGE", "OUTPUT", "START_JOB", "END_JOB",
+  "END", "$accept", "COLOR", "NUMBER", "cmykspec", "kcmyspec", "rgbspec",
+  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec",
+  "inputspec", "level", "channel_level", "gamma", "channel_gamma",
+  "global_gamma", "steps", "ink_limit", "printer", "page_size_name",
+  "page_size_custom", "page_size", "parameter_string", "parameter_int",
+  "parameter_bool", "parameter_float", "parameter_curve", "parameter",
+  "density", "top", "left", "hsize", "vsize", "blackline", "noscale",
+  "color_block1", "color_blocks1a", "color_blocks1b", "color_blocks1",
+  "color_block2a", "color_block2b", "color_block2", "color_blocks2a",
+  "color_blocks2", "color_blocks", "patvars", "pattern", "xpattern",
+  "grid", "image", "Message0", "Message1", "Message2", "Message3",
+  "Message4", "A_Message", "message", "Output0", "Output1", "A_Output",
+  "output", "start_job", "end_job", "A_Rule", "Rule", "A_Pattern",
+  "Pattern", "Patterns", "Image", "Rules", "Output", "EOF", "Thing", "@1", 0
 };
 #endif
 
@@ -650,26 +659,28 @@ static const yytype_uint16 yytoknum[] =
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    49,    50,    50,    50,    50,    50,    50,    50,    50,
-      51,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      59,    59,    59,    59,    59,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    71,    72,
-      73,    74,    75,    76,    76,    76,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    85,    86,    86,    87,
-      88,    89,    90,    90,    91,    91,    92,    92,    93,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   104,   104,   104,   104,   105,   106,   107,   108,   108,
-     109,   110,   110,   110,   110,   110,   110,   110,   110,   110,
-     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
-     110,   111,   112,   112,   112,   112,   113,   114,   114,   115,
-     116,   116,   117,   117,   118,   118,   120,   119
+       0,    52,    53,    53,    53,    53,    53,    53,    53,    53,
+      54,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      62,    62,    62,    62,    62,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    74,    75,
+      76,    77,    78,    79,    80,    80,    80,    80,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    89,    90,
+      90,    91,    92,    93,    94,    94,    95,    95,    96,    96,
+      97,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   108,   108,   108,   108,   109,   110,   111,
+     112,   112,   113,   114,   115,   116,   116,   116,   116,   116,
+     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
+     116,   116,   116,   116,   116,   116,   116,   117,   118,   118,
+     118,   118,   119,   120,   120,   121,   122,   122,   123,   123,
+     124,   124,   126,   125
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -679,15 +690,16 @@ static const yytype_uint8 yyr2[] =
        1,     1,     2,     2,     2,     2,     2,     2,     3,     1,
        1,     1,     1,     1,     1,     1,     2,     3,     3,     3,
        3,     2,     2,     2,     2,     2,     3,     1,     1,     3,
-       3,     3,     3,     1,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     2,     3,     1,     2,     0,     1,     2,
-       4,     5,     1,     1,     1,     2,     0,     1,     1,     1,
-       5,     3,     2,     2,     3,     2,     3,     4,     5,     6,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       3,     3,     3,     3,     1,     1,     1,     1,     1,     2,
+       2,     2,     2,     2,     2,     2,     3,     1,     2,     0,
+       1,     2,     4,     5,     1,     1,     1,     2,     0,     1,
+       1,     1,     5,     3,     2,     2,     3,     2,     3,     4,
+       5,     6,     1,     1,     1,     1,     1,     1,     1,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     1,     1,     1,     1,     2,     0,     2,     1,
-       0,     2,     1,     1,     0,     2,     0,     4
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       1,     1,     2,     0,     2,     1,     0,     2,     1,     1,
+       0,     2,     0,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -695,77 +707,79 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-     120,   126,     0,     0,     0,     0,     0,     0,     0,     0,
+     126,   132,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    86,   107,    93,    94,    91,    92,    95,    96,
-      97,    98,    37,    38,   108,    43,    44,    45,    46,    99,
-     100,   101,   102,   103,   104,   105,   106,    80,    81,    82,
-      83,    84,    85,   109,    88,    89,    90,   110,     0,   121,
-     117,     1,    11,    10,     2,     3,     4,     5,     6,     7,
-       8,     9,     0,    31,     0,     0,    32,    11,    33,    34,
-       0,     0,     0,     0,    47,    48,    49,    50,    51,    52,
-      53,     0,     0,     0,     0,     0,     0,     0,    19,    20,
-      21,    22,    23,    24,    25,    26,     0,    35,    75,    87,
-     111,     0,   119,   122,   123,   124,    30,    29,    28,    27,
-      39,    40,    41,    42,     0,    12,    13,    14,    15,    16,
-      17,    36,    76,     0,     0,    66,     0,   112,   113,   114,
-     115,     0,   118,     0,   127,    18,    77,    74,     0,    66,
-       0,     0,     0,    57,    68,    62,    63,    64,    67,    69,
-      72,    73,   116,   125,    78,     0,    71,     0,     0,     0,
-      55,    58,    59,    65,    79,     0,     0,     0,    54,    56,
-       0,     0,    60,    70,    61
+       0,     0,     0,    88,    93,    94,   111,    97,    98,    95,
+      96,    99,   100,   101,   102,    37,    38,   112,    44,    45,
+      48,    46,    47,   103,   104,   105,   106,   107,   108,   109,
+     110,    82,    83,    84,    85,    86,    87,   113,    90,    91,
+      92,   114,   115,   116,     0,   127,   123,     1,    11,    10,
+       2,     3,     4,     5,     6,     7,     8,     9,     0,    31,
+       0,     0,    32,    11,    33,    34,     0,     0,     0,     0,
+       0,    49,    50,    51,    52,    53,    54,    55,     0,     0,
+       0,     0,     0,     0,     0,    19,    20,    21,    22,    23,
+      24,    25,    26,     0,    35,    77,    89,   117,     0,   125,
+     128,   129,   130,    30,    29,    28,    27,    39,    40,    41,
+      42,    43,     0,    12,    13,    14,    15,    16,    17,    36,
+      78,     0,     0,    68,     0,   118,   119,   120,   121,     0,
+     124,     0,   133,    18,    79,    76,     0,    68,     0,     0,
+       0,    59,    70,    64,    65,    66,    69,    71,    74,    75,
+     122,   131,    80,     0,    73,     0,     0,     0,    57,    60,
+      61,    67,    81,     0,     0,     0,    56,    58,     0,     0,
+      62,    72,    63
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   151,   152,    98,    99,   100,   101,   102,   103,   104,
-     105,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,   153,   171,   172,   154,   155,
-     156,   157,   158,   159,   160,   149,   137,   138,   139,   112,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,   141,   142,   113,   114,     1,   115,   144,
-       2,    60
+      -1,   159,   160,   105,   106,   107,   108,   109,   110,   111,
+     112,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,   161,   179,   180,   162,
+     163,   164,   165,   166,   167,   168,   157,   145,   146,   147,
+     119,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,   149,   150,   120,   121,
+       1,   122,   152,     2,    66
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -112
+#define YYPACT_NINF -119
 static const yytype_int8 yypact[] =
 {
-    -112,     0,     1,    77,    88,    29,     2,    36,    38,    51,
-      52,    53,     2,     2,     2,     2,     2,    61,    63,    70,
-      -1,    62,    65,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,    33,  -112,
-      40,  -112,     2,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,     2,  -112,     2,     2,  -112,  -112,  -112,  -112,
-      69,    72,     2,    71,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,    79,    89,    90,   100,   101,   102,   103,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,   110,  -112,   109,  -112,
-    -112,   112,  -112,    31,  -112,    68,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,   114,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,   113,   116,     2,    27,   117,  -112,  -112,  -112,
-    -112,    86,  -112,    87,  -112,  -112,   118,  -112,     2,    27,
-     121,     2,     2,     2,  -112,  -112,  -112,  -112,    42,  -112,
-    -112,  -112,  -112,  -112,   120,     2,  -112,     2,     2,     2,
-    -112,     2,  -112,  -112,  -112,     2,     2,     2,  -112,  -112,
-       2,     2,  -112,  -112,  -112
+    -119,     1,     9,    81,    92,    -2,     2,    39,    40,    55,
+      57,    63,    64,     2,     2,     2,     2,     2,    31,    67,
+      73,    -1,    66,    68,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,    36,  -119,    42,  -119,     2,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,     2,  -119,
+       2,     2,  -119,  -119,  -119,  -119,    69,    77,    78,     2,
+      91,  -119,  -119,  -119,  -119,  -119,  -119,  -119,    79,    94,
+     104,   105,   106,   107,   114,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,   115,  -119,   116,  -119,  -119,   117,  -119,
+      32,  -119,    71,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,   120,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+     119,   122,     2,    29,   123,  -119,  -119,  -119,  -119,    83,
+    -119,    93,  -119,  -119,   125,  -119,     2,    29,   124,     2,
+       2,     2,  -119,  -119,  -119,  -119,    46,  -119,  -119,  -119,
+    -119,  -119,   126,     2,  -119,     2,     2,     2,  -119,     2,
+    -119,  -119,  -119,     2,     2,     2,  -119,  -119,     2,     2,
+    -119,  -119,  -119
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-    -112,     4,    -3,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -111,  -112,  -112,  -112,  -112,
-    -112,   -32,  -112,  -112,   -22,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,    15,  -112,  -112,  -112,
-    -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,  -112,
-    -112,  -112
+    -119,     4,    -3,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -118,  -119,  -119,  -119,
+    -119,  -119,   -38,  -119,  -119,   -25,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,    13,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
+    -119,  -119,  -119,  -119,  -119
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -775,71 +789,74 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      73,    61,   106,    78,   107,    77,    63,    72,    75,    84,
-      85,    86,    87,    88,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      77,    63,    76,    64,    65,    66,    67,    68,    69,    70,
-      71,    79,   170,    80,    19,    20,    21,    22,    64,    65,
-      66,    67,    68,    69,    70,    71,    81,    82,    83,   116,
-     179,   134,   135,   150,    89,   136,    90,   108,   110,   117,
-     109,   118,   119,   111,   120,   121,   123,    21,   150,   122,
-      62,    63,   124,    64,    65,    66,    67,    68,    69,    70,
-      71,    74,   125,   126,    64,    65,    66,    67,    68,    69,
-      70,    71,    91,   127,   128,   129,   130,    92,    93,    94,
-      95,    96,    97,   131,   132,   133,   143,   145,   146,   147,
-     161,   162,   163,   164,   167,   174,   173,   166,   140,     0,
-       0,   148,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   165,     0,     0,   168,   169,
+      79,    82,   113,    84,   114,    83,    69,    78,    81,    67,
+      91,    92,    93,    94,    95,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    83,    69,    96,    70,    71,    72,    73,    74,
+      75,    76,    77,   178,    85,    86,    20,    21,    22,    23,
+      24,    25,    70,    71,    72,    73,    74,    75,    76,    77,
+      87,   187,    88,   142,   143,   123,   158,   144,    89,    90,
+      97,   115,   117,   116,   127,   124,   118,   125,   126,    22,
+     128,   129,   132,   158,    68,    69,   130,    70,    71,    72,
+      73,    74,    75,    76,    77,    80,   131,   133,    70,    71,
+      72,    73,    74,    75,    76,    77,    98,   134,   135,   136,
+     137,    99,   100,   101,   102,   103,   104,   138,   139,   170,
+     141,   140,   151,   153,   154,   155,   169,   175,   181,   171,
+     172,   182,   174,   148,     0,     0,     0,     0,     0,   156,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   175,     0,   176,   177,   178,     0,     0,     0,
-       0,     0,   180,   181,   182,     0,     0,   183,   184
+       0,     0,     0,   173,     0,     0,   176,   177,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     183,     0,   184,   185,   186,     0,     0,     0,     0,     0,
+     188,   189,   190,     0,     0,   191,   192
 };
 
 static const yytype_int16 yycheck[] =
 {
-       3,     0,     3,     6,     5,     3,     4,     3,     4,    12,
-      13,    14,    15,    16,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-       3,     4,     3,     6,     7,     8,     9,    10,    11,    12,
-      13,     5,   153,     5,    44,    45,    46,    47,     6,     7,
-       8,     9,    10,    11,    12,    13,     5,     5,     5,    62,
-     171,    30,    31,    36,     3,    34,     3,     5,    35,    72,
-       5,    74,    75,    33,     5,     3,     5,    46,    36,    82,
-       3,     4,     3,     6,     7,     8,     9,    10,    11,    12,
-      13,     3,     3,     3,     6,     7,     8,     9,    10,    11,
-      12,    13,    32,     3,     3,     3,     3,    37,    38,    39,
-      40,    41,    42,     3,     5,     3,    48,     3,     5,     3,
-       3,    35,    35,     5,     3,     5,   158,   149,   113,    -1,
-      -1,   134,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   148,    -1,    -1,   151,   152,
+       3,     3,     3,     6,     5,     3,     4,     3,     4,     0,
+      13,    14,    15,    16,    17,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,     3,     4,     3,     6,     7,     8,     9,    10,
+      11,    12,    13,   161,     5,     5,    45,    46,    47,    48,
+      49,    50,     6,     7,     8,     9,    10,    11,    12,    13,
+       5,   179,     5,    31,    32,    68,    37,    35,     5,     5,
+       3,     5,    36,     5,     5,    78,    34,    80,    81,    47,
+       3,     3,     3,    37,     3,     4,    89,     6,     7,     8,
+       9,    10,    11,    12,    13,     3,     5,     3,     6,     7,
+       8,     9,    10,    11,    12,    13,    33,     3,     3,     3,
+       3,    38,    39,    40,    41,    42,    43,     3,     3,    36,
+       3,     5,    51,     3,     5,     3,     3,     3,   166,    36,
+       5,     5,   157,   120,    -1,    -1,    -1,    -1,    -1,   142,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   156,    -1,    -1,   159,   160,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   165,    -1,   167,   168,   169,    -1,    -1,    -1,
-      -1,    -1,   175,   176,   177,    -1,    -1,   180,   181
+     173,    -1,   175,   176,   177,    -1,    -1,    -1,    -1,    -1,
+     183,   184,   185,    -1,    -1,   188,   189
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   116,   119,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    44,
-      45,    46,    47,    60,    61,    62,    63,    64,    65,    66,
+       0,   122,   125,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      45,    46,    47,    48,    49,    50,    63,    64,    65,    66,
       67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     120,     0,     3,     4,     6,     7,     8,     9,    10,    11,
-      12,    13,    50,    51,     3,    50,     3,     3,    51,     5,
-       5,     5,     5,     5,    51,    51,    51,    51,    51,     3,
-       3,    32,    37,    38,    39,    40,    41,    42,    52,    53,
-      54,    55,    56,    57,    58,    59,     3,     5,     5,     5,
-      35,    33,    98,   114,   115,   117,    51,    51,    51,    51,
-       5,     3,    51,     5,     3,     3,     3,     3,     3,     3,
-       3,     3,     5,     3,    30,    31,    34,    95,    96,    97,
-     105,   112,   113,    48,   118,     3,     5,     3,    51,    94,
-      36,    50,    51,    84,    87,    88,    89,    90,    91,    92,
-      93,     3,    35,    35,     5,    51,    93,     3,    51,    51,
-      84,    85,    86,    90,     5,    51,    51,    51,    51,    84,
-      51,    51,    51,    51,    51
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   126,     0,     3,     4,
+       6,     7,     8,     9,    10,    11,    12,    13,    53,    54,
+       3,    53,     3,     3,    54,     5,     5,     5,     5,     5,
+       5,    54,    54,    54,    54,    54,     3,     3,    33,    38,
+      39,    40,    41,    42,    43,    55,    56,    57,    58,    59,
+      60,    61,    62,     3,     5,     5,     5,    36,    34,   102,
+     120,   121,   123,    54,    54,    54,    54,     5,     3,     3,
+      54,     5,     3,     3,     3,     3,     3,     3,     3,     3,
+       5,     3,    31,    32,    35,    99,   100,   101,   109,   118,
+     119,    51,   124,     3,     5,     3,    54,    98,    37,    53,
+      54,    88,    91,    92,    93,    94,    95,    96,    97,     3,
+      36,    36,     5,    54,    97,     3,    54,    54,    88,    89,
+      90,    94,     5,    54,    54,    54,    54,    88,    54,    54,
+      54,    54,    54
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1654,7 +1671,7 @@ yyreduce:
   switch (yyn)
     {
         case 12:
-#line 148 "testpatterny.y"
+#line 151 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1667,7 +1684,7 @@ yyreduce:
     break;
 
   case 13:
-#line 160 "testpatterny.y"
+#line 163 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1680,7 +1697,7 @@ yyreduce:
     break;
 
   case 14:
-#line 172 "testpatterny.y"
+#line 175 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1693,7 +1710,7 @@ yyreduce:
     break;
 
   case 15:
-#line 184 "testpatterny.y"
+#line 187 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1706,7 +1723,7 @@ yyreduce:
     break;
 
   case 16:
-#line 196 "testpatterny.y"
+#line 199 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1719,7 +1736,7 @@ yyreduce:
     break;
 
   case 17:
-#line 208 "testpatterny.y"
+#line 211 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival));
@@ -1732,7 +1749,7 @@ yyreduce:
     break;
 
   case 18:
-#line 220 "testpatterny.y"
+#line 223 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival));
@@ -1745,7 +1762,7 @@ yyreduce:
     break;
 
   case 27:
-#line 238 "testpatterny.y"
+#line 241 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1756,7 +1773,7 @@ yyreduce:
     break;
 
   case 28:
-#line 248 "testpatterny.y"
+#line 251 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval);
@@ -1766,7 +1783,7 @@ yyreduce:
     break;
 
   case 29:
-#line 257 "testpatterny.y"
+#line 260 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1777,7 +1794,7 @@ yyreduce:
     break;
 
   case 30:
-#line 267 "testpatterny.y"
+#line 270 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval);
@@ -1787,7 +1804,7 @@ yyreduce:
     break;
 
   case 31:
-#line 276 "testpatterny.y"
+#line 279 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1796,7 +1813,7 @@ yyreduce:
     break;
 
   case 32:
-#line 283 "testpatterny.y"
+#line 286 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival));
@@ -1805,7 +1822,7 @@ yyreduce:
     break;
 
   case 33:
-#line 290 "testpatterny.y"
+#line 293 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1814,7 +1831,7 @@ yyreduce:
     break;
 
   case 34:
-#line 297 "testpatterny.y"
+#line 300 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval));
@@ -1824,7 +1841,7 @@ yyreduce:
     break;
 
   case 35:
-#line 306 "testpatterny.y"
+#line 309 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval));
@@ -1834,7 +1851,7 @@ yyreduce:
     break;
 
   case 36:
-#line 315 "testpatterny.y"
+#line 318 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -1844,7 +1861,7 @@ yyreduce:
     break;
 
   case 39:
-#line 327 "testpatterny.y"
+#line 330 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
@@ -1855,7 +1872,7 @@ yyreduce:
     break;
 
   case 40:
-#line 337 "testpatterny.y"
+#line 340 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
@@ -1865,7 +1882,17 @@ yyreduce:
     break;
 
   case 41:
-#line 346 "testpatterny.y"
+#line 349 "testpatterny.y"
+    {
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>parameter_bool %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
+	  stp_set_boolean_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
+	  free((yyvsp[(2) - (3)].sval));
+	}
+    break;
+
+  case 42:
+#line 358 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval);
@@ -1874,8 +1901,8 @@ yyreduce:
 	}
     break;
 
-  case 42:
-#line 355 "testpatterny.y"
+  case 43:
+#line 367 "testpatterny.y"
     {
 	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval));
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1889,8 +1916,8 @@ yyreduce:
 	}
     break;
 
-  case 47:
-#line 371 "testpatterny.y"
+  case 49:
+#line 383 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1898,8 +1925,8 @@ yyreduce:
 	}
     break;
 
-  case 48:
-#line 378 "testpatterny.y"
+  case 50:
+#line 390 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1907,8 +1934,8 @@ yyreduce:
 	}
     break;
 
-  case 49:
-#line 385 "testpatterny.y"
+  case 51:
+#line 397 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
  	    fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1916,8 +1943,8 @@ yyreduce:
 	}
     break;
 
-  case 50:
-#line 392 "testpatterny.y"
+  case 52:
+#line 404 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1925,8 +1952,8 @@ yyreduce:
 	}
     break;
 
-  case 51:
-#line 399 "testpatterny.y"
+  case 53:
+#line 411 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)]).dval);
@@ -1934,8 +1961,8 @@ yyreduce:
 	}
     break;
 
-  case 52:
-#line 406 "testpatterny.y"
+  case 54:
+#line 418 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival));
@@ -1943,8 +1970,8 @@ yyreduce:
 	}
     break;
 
-  case 53:
-#line 414 "testpatterny.y"
+  case 55:
+#line 426 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>noscale %d\n", (yyvsp[(2) - (2)].ival));
@@ -1952,8 +1979,8 @@ yyreduce:
 	}
     break;
 
-  case 54:
-#line 422 "testpatterny.y"
+  case 56:
+#line 434 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)]).dval, (yyvsp[(2) - (3)]).dval, (yyvsp[(3) - (3)]).dval,
@@ -1968,8 +1995,8 @@ yyreduce:
 	}
     break;
 
-  case 60:
-#line 446 "testpatterny.y"
+  case 62:
+#line 458 "testpatterny.y"
     {
 	  int channel = find_color((yyvsp[(1) - (4)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1983,8 +2010,8 @@ yyreduce:
 	}
     break;
 
-  case 61:
-#line 460 "testpatterny.y"
+  case 63:
+#line 472 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval);
@@ -1997,8 +2024,8 @@ yyreduce:
 	}
     break;
 
-  case 70:
-#line 485 "testpatterny.y"
+  case 72:
+#line 497 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)]).dval, (yyvsp[(2) - (5)]).dval, (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval);
@@ -2013,8 +2040,8 @@ yyreduce:
 	}
     break;
 
-  case 72:
-#line 503 "testpatterny.y"
+  case 74:
+#line 515 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>xpattern\n");
@@ -2029,8 +2056,8 @@ yyreduce:
 	}
     break;
 
-  case 73:
-#line 518 "testpatterny.y"
+  case 75:
+#line 530 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival));
@@ -2041,8 +2068,8 @@ yyreduce:
 	}
     break;
 
-  case 74:
-#line 529 "testpatterny.y"
+  case 76:
+#line 541 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -2059,16 +2086,16 @@ yyreduce:
 	}
     break;
 
-  case 75:
-#line 546 "testpatterny.y"
+  case 77:
+#line 558 "testpatterny.y"
     {
 	  fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval));
 	  free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
-  case 76:
-#line 552 "testpatterny.y"
+  case 78:
+#line 564 "testpatterny.y"
     {
 	  fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
 	  free((yyvsp[(2) - (3)].sval));
@@ -2076,8 +2103,8 @@ yyreduce:
 	}
     break;
 
-  case 77:
-#line 559 "testpatterny.y"
+  case 79:
+#line 571 "testpatterny.y"
     {
 	  fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval));
 	  free((yyvsp[(2) - (4)].sval));
@@ -2086,8 +2113,8 @@ yyreduce:
 	}
     break;
 
-  case 78:
-#line 567 "testpatterny.y"
+  case 80:
+#line 579 "testpatterny.y"
     {
 	  fprintf(stderr, "%s%s%s%s", (yyvsp[(2) - (5)].sval), (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].sval), (yyvsp[(5) - (5)].sval));
 	  free((yyvsp[(2) - (5)].sval));
@@ -2097,8 +2124,8 @@ yyreduce:
 	}
     break;
 
-  case 79:
-#line 576 "testpatterny.y"
+  case 81:
+#line 588 "testpatterny.y"
     {
 	  fprintf(stderr, "%s%s%s%s%s", (yyvsp[(2) - (6)].sval), (yyvsp[(3) - (6)].sval), (yyvsp[(4) - (6)].sval), (yyvsp[(5) - (6)].sval), (yyvsp[(6) - (6)].sval));
 	  free((yyvsp[(2) - (6)].sval));
@@ -2109,44 +2136,56 @@ yyreduce:
 	}
     break;
 
-  case 86:
-#line 593 "testpatterny.y"
+  case 88:
+#line 605 "testpatterny.y"
     {
+	  close_output();
 	  if (global_output)
 	    free(global_output);
 	  global_output = NULL;
+	  output = stdout;
 	}
     break;
 
-  case 87:
-#line 600 "testpatterny.y"
+  case 89:
+#line 614 "testpatterny.y"
     {
 	  global_output = (yyvsp[(2) - (2)].sval);
 	}
     break;
 
-  case 111:
-#line 616 "testpatterny.y"
-    { global_did_something = 1; }
+  case 93:
+#line 625 "testpatterny.y"
+    { start_job = 1; }
     break;
 
-  case 116:
-#line 623 "testpatterny.y"
+  case 94:
+#line 629 "testpatterny.y"
+    { end_job = 1; }
+    break;
+
+  case 117:
+#line 639 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 119:
-#line 630 "testpatterny.y"
+  case 122:
+#line 646 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
   case 125:
-#line 640 "testpatterny.y"
+#line 653 "testpatterny.y"
+    { global_did_something = 1; }
+    break;
+
+  case 131:
+#line 663 "testpatterny.y"
     { return 0; }
     break;
 
-  case 126:
-#line 644 "testpatterny.y"
+  case 132:
+#line 667 "testpatterny.y"
     {
 	  current_testpattern = get_next_testpattern();
 	}
@@ -2154,7 +2193,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2158 "testpatterny.c"
+#line 2197 "testpatterny.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2368,6 +2407,6 @@ yyreturn:
 }
 
 
-#line 650 "testpatterny.y"
+#line 673 "testpatterny.y"
 
 
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index fdb65ae..c36836e 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -57,34 +57,37 @@
      PRINTER = 273,
      PARAMETER = 274,
      PARAMETER_INT = 275,
-     PARAMETER_FLOAT = 276,
-     PARAMETER_CURVE = 277,
-     DENSITY = 278,
-     TOP = 279,
-     LEFT = 280,
-     HSIZE = 281,
-     VSIZE = 282,
-     BLACKLINE = 283,
-     NOSCALE = 284,
-     PATTERN = 285,
-     XPATTERN = 286,
-     EXTENDED = 287,
-     IMAGE = 288,
-     GRID = 289,
-     SEMI = 290,
-     CHANNEL = 291,
-     CMYK = 292,
-     KCMY = 293,
-     RGB = 294,
-     CMY = 295,
-     GRAY = 296,
-     WHITE = 297,
-     RAW = 298,
-     MODE = 299,
-     PAGESIZE = 300,
-     MESSAGE = 301,
-     OUTPUT = 302,
-     END = 303
+     PARAMETER_BOOL = 276,
+     PARAMETER_FLOAT = 277,
+     PARAMETER_CURVE = 278,
+     DENSITY = 279,
+     TOP = 280,
+     LEFT = 281,
+     HSIZE = 282,
+     VSIZE = 283,
+     BLACKLINE = 284,
+     NOSCALE = 285,
+     PATTERN = 286,
+     XPATTERN = 287,
+     EXTENDED = 288,
+     IMAGE = 289,
+     GRID = 290,
+     SEMI = 291,
+     CHANNEL = 292,
+     CMYK = 293,
+     KCMY = 294,
+     RGB = 295,
+     CMY = 296,
+     GRAY = 297,
+     WHITE = 298,
+     RAW = 299,
+     MODE = 300,
+     PAGESIZE = 301,
+     MESSAGE = 302,
+     OUTPUT = 303,
+     START_JOB = 304,
+     END_JOB = 305,
+     END = 306
    };
 #endif
 /* Tokens.  */
@@ -106,34 +109,37 @@
 #define PRINTER 273
 #define PARAMETER 274
 #define PARAMETER_INT 275
-#define PARAMETER_FLOAT 276
-#define PARAMETER_CURVE 277
-#define DENSITY 278
-#define TOP 279
-#define LEFT 280
-#define HSIZE 281
-#define VSIZE 282
-#define BLACKLINE 283
-#define NOSCALE 284
-#define PATTERN 285
-#define XPATTERN 286
-#define EXTENDED 287
-#define IMAGE 288
-#define GRID 289
-#define SEMI 290
-#define CHANNEL 291
-#define CMYK 292
-#define KCMY 293
-#define RGB 294
-#define CMY 295
-#define GRAY 296
-#define WHITE 297
-#define RAW 298
-#define MODE 299
-#define PAGESIZE 300
-#define MESSAGE 301
-#define OUTPUT 302
-#define END 303
+#define PARAMETER_BOOL 276
+#define PARAMETER_FLOAT 277
+#define PARAMETER_CURVE 278
+#define DENSITY 279
+#define TOP 280
+#define LEFT 281
+#define HSIZE 282
+#define VSIZE 283
+#define BLACKLINE 284
+#define NOSCALE 285
+#define PATTERN 286
+#define XPATTERN 287
+#define EXTENDED 288
+#define IMAGE 289
+#define GRID 290
+#define SEMI 291
+#define CHANNEL 292
+#define CMYK 293
+#define KCMY 294
+#define RGB 295
+#define CMY 296
+#define GRAY 297
+#define WHITE 298
+#define RAW 299
+#define MODE 300
+#define PAGESIZE 301
+#define MESSAGE 302
+#define OUTPUT 303
+#define START_JOB 304
+#define END_JOB 305
+#define END 306
 
 
 
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
index f3527d1..fcd7401 100644
--- a/src/testpattern/testpatterny.y
+++ b/src/testpattern/testpatterny.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatterny.y,v 1.30 2008/01/27 21:44:21 rlk Exp $"
+ * "$Id: testpatterny.y,v 1.32 2008/06/08 01:03:51 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -105,6 +105,7 @@ find_color(const char *name)
 %token PRINTER
 %token PARAMETER
 %token PARAMETER_INT
+%token PARAMETER_BOOL
 %token PARAMETER_FLOAT
 %token PARAMETER_CURVE
 %token DENSITY
@@ -132,6 +133,8 @@ find_color(const char *name)
 %token PAGESIZE
 %token MESSAGE
 %token OUTPUT
+%token START_JOB
+%token END_JOB
 %token END
 
 %start Thing
@@ -342,6 +345,15 @@ parameter_int: PARAMETER_INT tSTRING tINT
 	}
 ;
 
+parameter_bool: PARAMETER_BOOL tSTRING tINT
+	{
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>parameter_bool %s %d\n", $2, $3);
+	  stp_set_boolean_parameter(global_vars, $2, $3);
+	  free($2);
+	}
+;
+
 parameter_float: PARAMETER_FLOAT tSTRING NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -365,7 +377,7 @@ parameter_curve: PARAMETER_CURVE tSTRING tSTRING
 	}
 ;
 
-parameter: parameter_string | parameter_int | parameter_float | parameter_curve
+parameter: parameter_string | parameter_int | parameter_float | parameter_curve | parameter_bool
 ;
 density: DENSITY NUMBER
 	{
@@ -591,9 +603,11 @@ message: A_Message
 
 Output0: OUTPUT
 	{
+	  close_output();
 	  if (global_output)
 	    free(global_output);
 	  global_output = NULL;
+	  output = stdout;
 	}
 
 Output1: OUTPUT tSTRING
@@ -607,9 +621,18 @@ A_Output: Output0 | Output1
 output: A_Output
 ;
 
+start_job: START_JOB
+	{ start_job = 1; }
+;
+
+end_job: END_JOB
+	{ end_job = 1; }
+;
+
 A_Rule: gamma | channel_gamma | level | channel_level | global_gamma | steps
 	| ink_limit | printer | parameter | density | top | left | hsize
-	| vsize | blackline | noscale | inputspec | page_size | message | output
+	| vsize | blackline | noscale | inputspec | page_size | message
+	| output | start_job | end_job
 ;
 
 Rule: A_Rule SEMI
diff --git a/src/xml/Makefile.am b/src/xml/Makefile.am
new file mode 100644
index 0000000..65d76f5
--- /dev/null
+++ b/src/xml/Makefile.am
@@ -0,0 +1,66 @@
+## $Id: Makefile.am,v 1.2 2008/06/10 13:10:22 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+SUBDIRS = escp2
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
+
+pkgxmldata_DATA =				\
+	dither-matrix-1x1.xml			\
+	dither-matrix-2x1.xml			\
+	dither-matrix-4x1.xml			\
+	papers.xml				\
+	printers.xml
+
+## Rules
+
+noinst_PROGRAMS = extract-strings
+
+extract_strings_SOURCES = extract-strings.c
+extract_strings_LDADD = $(GUTENPRINT_LIBS)
+
+xml-stamp: $(pkgxmldata_DATA) escp2/xml-stamp Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;escp2/;' escp2/xml-stamp >> xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xmli18n-tmp.h xml-stamp
+
+
+xmli18n-tmp.h:  xml-stamp extract-strings
+	./extract-strings `cat xml-stamp` > xmli18n-tmp.h
+
+
+dist-hook: xmli18n-tmp.h
+# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
+
+## Clean
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xml/Makefile.in b/src/xml/Makefile.in
new file mode 100644
index 0000000..5f49e85
--- /dev/null
+++ b/src/xml/Makefile.in
@@ -0,0 +1,735 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+noinst_PROGRAMS = extract-strings$(EXEEXT)
+subdir = src/xml
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_extract_strings_OBJECTS = extract-strings.$(OBJEXT)
+extract_strings_OBJECTS = $(am_extract_strings_OBJECTS)
+extract_strings_DEPENDENCIES = $(GUTENPRINT_LIBS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(extract_strings_SOURCES)
+DIST_SOURCES = $(extract_strings_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+SUBDIRS = escp2
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml
+pkgxmldata_DATA = \
+	dither-matrix-1x1.xml			\
+	dither-matrix-2x1.xml			\
+	dither-matrix-4x1.xml			\
+	papers.xml				\
+	printers.xml
+
+extract_strings_SOURCES = extract-strings.c
+extract_strings_LDADD = $(GUTENPRINT_LIBS)
+# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+MAINTAINERCLEANFILES = Makefile.in
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+extract-strings$(EXEEXT): $(extract_strings_OBJECTS) $(extract_strings_DEPENDENCIES) 
+	@rm -f extract-strings$(EXEEXT)
+	$(LINK) $(extract_strings_OBJECTS) $(extract_strings_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract-strings.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(DATA) all-local
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \
+	dist-hook distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgxmldataDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) escp2/xml-stamp Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;escp2/;' escp2/xml-stamp >> xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xmli18n-tmp.h xml-stamp
+
+xmli18n-tmp.h:  xml-stamp extract-strings
+	./extract-strings `cat xml-stamp` > xmli18n-tmp.h
+
+dist-hook: xmli18n-tmp.h
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/main/dither-matrix-1x1.xml b/src/xml/dither-matrix-1x1.xml
index 87a2ccf..87a2ccf 100644
--- a/src/main/dither-matrix-1x1.xml
+++ b/src/xml/dither-matrix-1x1.xml
diff --git a/src/main/dither-matrix-2x1.xml b/src/xml/dither-matrix-2x1.xml
index 29aab5e..29aab5e 100644
--- a/src/main/dither-matrix-2x1.xml
+++ b/src/xml/dither-matrix-2x1.xml
diff --git a/src/main/dither-matrix-4x1.xml b/src/xml/dither-matrix-4x1.xml
index 46d6817..46d6817 100644
--- a/src/main/dither-matrix-4x1.xml
+++ b/src/xml/dither-matrix-4x1.xml
diff --git a/src/xml/escp2/Makefile.am b/src/xml/escp2/Makefile.am
new file mode 100644
index 0000000..987c5b7
--- /dev/null
+++ b/src/xml/escp2/Makefile.am
@@ -0,0 +1,56 @@
+## $Id: Makefile.am,v 1.7 2008/07/03 12:34:39 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+SUBDIRS =					\
+	inks					\
+	inputslots				\
+	model					\
+	media					\
+	mediasizes				\
+	qualitypresets				\
+	weaves
+
+xml-stamp: media/xml-stamp			\
+	   model/xml-stamp			\
+	   inputslots/xml-stamp			\
+	   inks/xml-stamp			\
+	   mediasizes/xml-stamp			\
+	   qualitypresets/Makefile.am		\
+	   weaves/Makefile.am			\
+	   Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;media/;' media/xml-stamp >> xml-stamp
+	sed 's;^;model/;' model/xml-stamp >> xml-stamp
+	sed 's;^;inputslots/;' inputslots/xml-stamp >> xml-stamp
+	sed 's;^;inks/;' inks/xml-stamp >> xml-stamp
+	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> xml-stamp
+	sed 's;^;weaves/;' weaves/xml-stamp >> xml-stamp
+	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> xml-stamp
+
+all-local: xml-stamp
+## Clean
+
+CLEANFILES = xml-stamp
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xml/escp2/Makefile.in b/src/xml/escp2/Makefile.in
new file mode 100644
index 0000000..e70c983
--- /dev/null
+++ b/src/xml/escp2/Makefile.in
@@ -0,0 +1,640 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+SUBDIRS = \
+	inks					\
+	inputslots				\
+	model					\
+	media					\
+	mediasizes				\
+	qualitypresets				\
+	weaves
+
+CLEANFILES = xml-stamp
+MAINTAINERCLEANFILES = Makefile.in
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile all-local
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am all-local check check-am clean clean-generic \
+	clean-libtool ctags ctags-recursive distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: media/xml-stamp			\
+	   model/xml-stamp			\
+	   inputslots/xml-stamp			\
+	   inks/xml-stamp			\
+	   mediasizes/xml-stamp			\
+	   qualitypresets/Makefile.am		\
+	   weaves/Makefile.am			\
+	   Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	sed 's;^;media/;' media/xml-stamp >> xml-stamp
+	sed 's;^;model/;' model/xml-stamp >> xml-stamp
+	sed 's;^;inputslots/;' inputslots/xml-stamp >> xml-stamp
+	sed 's;^;inks/;' inks/xml-stamp >> xml-stamp
+	sed 's;^;mediasizes/;' mediasizes/xml-stamp >> xml-stamp
+	sed 's;^;weaves/;' weaves/xml-stamp >> xml-stamp
+	sed 's;^;qualitypresets/;' qualitypresets/xml-stamp >> xml-stamp
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am
new file mode 100644
index 0000000..73cdec5
--- /dev/null
+++ b/src/xml/escp2/inks/Makefile.am
@@ -0,0 +1,76 @@
+## $Id: Makefile.am,v 1.5 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inks
+
+pkgxmldata_DATA =				\
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	defaultblack.xml			\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	nx100.xml				\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf40.xml				\
+	wf500.xml				\
+	x80.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
new file mode 100644
index 0000000..768e57d
--- /dev/null
+++ b/src/xml/escp2/inks/Makefile.in
@@ -0,0 +1,530 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/inks
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inks
+pkgxmldata_DATA = \
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	defaultblack.xml			\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	nx100.xml				\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf40.xml				\
+	wf500.xml				\
+	x80.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/inks/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/inks/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/inks/b500.xml b/src/xml/escp2/inks/b500.xml
new file mode 100644
index 0000000..661b168
--- /dev/null
+++ b/src/xml/escp2/inks/b500.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="b500">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="b500_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="4">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SplitChannels count="2">2 66</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="4">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SplitChannels count="2">1 65</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="4">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="b500_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="4">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SplitChannels count="2">2 66</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="4">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SplitChannels count="2">1 65</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>e
+    <subchannel color="4" subchannel="4">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="b500_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="b500_cyan" index="0">
+    <subchannel color="2" subchannel="4">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SplitChannels count="2">2 66</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_magenta" index="1">
+    <subchannel color="1" subchannel="4">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SplitChannels count="2">1 65</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_yellow" index="2">
+    <subchannel color="4" subchannel="4">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="b500_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_cyan" index="1">
+    <subchannel color="2" subchannel="4">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SplitChannels count="2">2 66</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_magenta" index="2">
+    <subchannel color="1" subchannel="4">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SplitChannels count="2">1 65</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="b500_yellow" index="3">
+    <subchannel color="4" subchannel="4">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SplitChannels count="2">4 68</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c120.xml b/src/xml/escp2/inks/c120.xml
new file mode 100644
index 0000000..ca26273
--- /dev/null
+++ b/src/xml/escp2/inks/c120.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="c120">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c120_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="c120_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c120_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c120_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c120_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="1">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="2">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c120_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="2">0 64</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="c120_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_magenta" index="2">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c120_yellow" index="3">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c64.xml b/src/xml/escp2/inks/c64.xml
new file mode 100644
index 0000000..ee18fad
--- /dev/null
+++ b/src/xml/escp2/inks/c64.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="c64">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="1">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="2">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+<InkList translate="text" name="Quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c64_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c80.xml b/src/xml/escp2/inks/c80.xml
new file mode 100644
index 0000000..1012631
--- /dev/null
+++ b/src/xml/escp2/inks/c80.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="c80">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="1">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="2">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="Quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c80_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/c82.xml b/src/xml/escp2/inks/c82.xml
new file mode 100644
index 0000000..732a6c3
--- /dev/null
+++ b/src/xml/escp2/inks/c82.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="c82">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="1">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="2">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c80_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_magenta" index="2">
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c80_yellow" index="3">
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="Quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c80_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="120">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="240">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml
new file mode 100644
index 0000000..30c0abb
--- /dev/null
+++ b/src/xml/escp2/inks/claria.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="claria">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="claria_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>e
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="claria_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_cyan" index="0">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="1">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="2">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_cyan" index="0">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_cyan" index="1">
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="claria_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_cyan" index="2">
+    <subchannel color="2" subchannel="1" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_magenta" index="3">
+    <subchannel color="1" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_claria_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="claria_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="2">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmy.xml b/src/xml/escp2/inks/cmy.xml
new file mode 100644
index 0000000..8637a69
--- /dev/null
+++ b/src/xml/escp2/inks/cmy.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="cmy">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmykrb.xml b/src/xml/escp2/inks/cmykrb.xml
new file mode 100644
index 0000000..4355a52
--- /dev/null
+++ b/src/xml/escp2/inks/cmykrb.xml
@@ -0,0 +1,664 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="cmykrb">
+<Curves>
+ <curve name="cmykrbCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	0.875	0.7	0.55	0.4	0.3	0.2	0.1
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.125	0.25	0.375	0.5	0.625	0.75	0.875
+	1	1	1	1	1	1	1	1
+  </sequence>
+ </curve>
+ <curve name="cmykrbMagenta" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0.002	0.05	0.3	0.6	0.8
+	1	1	0.85	0.7	0.6	0.5	0.4	0.3
+	0.2	0.1	0.05	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykrbYellow" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0.05	0.15
+	0.25	0.35	0.45	0.55	0.65	0.75	0.85	0.95
+	1	1	1	1	1	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+  </sequence>
+ </curve>
+ <curve name="cmykrbRed" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0.025	0.4	0.6	0.75	0.89	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykrbBlue" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0.25	0.475	0.7	0.81	0.875	0.94	1
+	1	0.975	0.93	0.875	0.81	0.74	0.65	0.4
+	0.04	0.002	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+</Curves>
+
+<InkList translate="text" name="cmykrbphoto" text="Photo Black">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRBG" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYRBG" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlackGloss" text="One Color Raw Enhanced Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="1">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="3">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="4">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Enhanced Gloss Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="6">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKPRB" text="Seven Color Enhanced Gloss Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_black" index="1">
+    <subchannel color="0" subchannel="4" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="2">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="4">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="5">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="6">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="7">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="cmykrbmatte" text="Matte Black">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYRB" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r800_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykrbCyan"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykrbMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykrbYellow"/>
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykrbRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve ref="cmykrbBlue"/>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_yellow" index="3">
+    <subchannel color="4" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r800_blue" index="5">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cmykro.xml b/src/xml/escp2/inks/cmykro.xml
new file mode 100644
index 0000000..3a68f1b
--- /dev/null
+++ b/src/xml/escp2/inks/cmykro.xml
@@ -0,0 +1,663 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="cmykro">
+<Curves>
+ <curve name="cmykroCyan" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	0.95	0.89	0.83	0.75	0.6	0.4	0.2
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.2	0.4	0.6	0.75	0.83	0.89	0.95
+	1	1	1	1	1	1	1	1
+  </sequence>
+ </curve>
+ <curve name="cmykroMagenta" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0.2	0.4	0.6	0.75	0.83	0.89	0.95
+	1	1	1	1	1	1	1	1
+	1	1	0.85	0.7	0.6	0.5	0.4	0.3
+	0.2	0.1	0.05	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykroYellow" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.05	0.1	0.15	0.3	0.45	0.6	0.8
+	1	1	1	1	1	1	1	1
+	1	0.95	0.89	0.83	0.75	0.6	0.4	0.2
+  </sequence>
+ </curve>
+ <curve name="cmykroRed" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.2	0.4	0.6	0.8	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.23	0.1
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+ <curve name="cmykroOrange" wrap="wrap" type="linear" gamma="0" piecewise="false">
+  <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.25	0.4	0.5	0.5	0.5	0.4	0.15
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+  </sequence>
+ </curve>
+</Curves>
+<InkList translate="text" name="cmykrophoto" text="Photo Black">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKROG" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYROG" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+  <AuxChannels>
+   <channel name="standard_gloss" index="0">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </AuxChannels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlackGloss" text="One Color Raw Enhanced Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="1">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="3">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw Gloss" InkID="Extended">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="4">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Enhanced Gloss Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_photo_black" index="0">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="6">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKPRO" text="Seven Color Enhanced Gloss Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_black" index="1">
+    <subchannel color="0" subchannel="4">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="4">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="5">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="6">
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_gloss" index="7">
+    <subchannel color="9">
+     <ChannelDensityParam name="GlossDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="cmykromatte" text="Matte Black">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRO" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYRO" text="Five Color Photo Composite" InkID="OTHER">
+  <Channels>
+   <channel name="r1900_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve ref="cmykroCyan"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve ref="cmykroMagenta"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve ref="cmykroYellow"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve ref="cmykroRed"/>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <HueCurveParam name="OrangeHueCurve"/>
+    <HueCurve ref="cmykroOrange"/>
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="r1900_orange" index="5">
+    <subchannel color="10">
+     <ChannelDensityParam name="OrangeDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/cx3650.xml b/src/xml/escp2/inks/cx3650.xml
new file mode 100644
index 0000000..c237561
--- /dev/null
+++ b/src/xml/escp2/inks/cx3650.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="cx3650">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="0">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+<InkList translate="text" name="Quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="cx3650_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/defaultblack.xml b/src/xml/escp2/inks/defaultblack.xml
new file mode 100644
index 0000000..3a12214
--- /dev/null
+++ b/src/xml/escp2/inks/defaultblack.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="defaultblack">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Default Black" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0" shade="1.000000">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360.xml b/src/xml/escp2/inks/f360.xml
new file mode 100644
index 0000000..0a10492
--- /dev/null
+++ b/src/xml/escp2/inks/f360.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="f360">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="f360_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="Quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="f360_quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_photo.xml b/src/xml/escp2/inks/f360_photo.xml
new file mode 100644
index 0000000..e4e5295
--- /dev/null
+++ b/src/xml/escp2/inks/f360_photo.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="f360_photo">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.316000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.500000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_photo7_japan.xml b/src/xml/escp2/inks/f360_photo7_japan.xml
new file mode 100644
index 0000000..9f821a7
--- /dev/null
+++ b/src/xml/escp2/inks/f360_photo7_japan.xml
@@ -0,0 +1,419 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="f360_photo7_japan">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.316000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.500000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Photo7J" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo2_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="2">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+     <SubchannelValueParam name="DarkYellowValue"/>
+     <SubchannelScaleParam name="DarkYellowScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoEnhanceJ" text="Six Color Enhanced Composite" InkID="CcMmYyK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo2_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="2">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+     <SubchannelTransitionParam name="DarkYellowTrans"/>
+     <SubchannelValueParam name="DarkYellowValue"/>
+     <SubchannelScaleParam name="DarkYellowScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="2">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="4">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="6">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome.xml b/src/xml/escp2/inks/f360_ultrachrome.xml
new file mode 100644
index 0000000..f565001
--- /dev/null
+++ b/src/xml/escp2/inks/f360_ultrachrome.xml
@@ -0,0 +1,775 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="f360_ultrachrome">
+<InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+ <Shades>
+  <shade count="2">1.000000 0.480000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="2">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="4">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="6">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+ </InkList>
+ <InkList translate="text" name="ultramatte"
+ text="UltraChrome Matte Black">
+ <Shades>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="3">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_standard_cyan" index="0">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="4">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="5">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_cyan" index="2">
+    <subchannel color="2" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="4">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_yellow" index="6">
+    <subchannel color="4" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3.xml b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
new file mode 100644
index 0000000..d9a64f6
--- /dev/null
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
@@ -0,0 +1,590 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="f360_ultrachrome_k3">
+<InkList translate="text" name="ultra3photo" text="Photo Black">
+ <Shades>
+  <shade count="3">1.000000 0.480000 0.160000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.200000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo3_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="5">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="ultra3matte" text="Matte Black">
+ <Shades>
+  <shade count="3">1.000000 0.278000 0.093000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.200000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo3_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <subchannel color="1" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" headOffset="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" headOffset="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="5">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/nx100.xml b/src/xml/escp2/inks/nx100.xml
new file mode 100644
index 0000000..f0a8d1c
--- /dev/null
+++ b/src/xml/escp2/inks/nx100.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:InkGroup name="nx100">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="c64_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="1">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="2">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="c64_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_magenta" index="2">
+    <subchannel color="1" headOffset="90">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="c64_yellow" index="3">
+    <subchannel color="4" headOffset="180">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen0.xml b/src/xml/escp2/inks/photo_gen0.xml
new file mode 100644
index 0000000..8a61dcd
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen0.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_gen0">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.305000</shade>
+  <shade count="2">1.000000 0.315000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity" />
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen1.xml b/src/xml/escp2/inks/photo_gen1.xml
new file mode 100644
index 0000000..e616e0e
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen1.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_gen1">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.305000</shade>
+  <shade count="2">1.000000 0.315000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen2.xml b/src/xml/escp2/inks/photo_gen2.xml
new file mode 100644
index 0000000..bb6d6eb
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen2.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_gen2">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen3.xml b/src/xml/escp2/inks/photo_gen3.xml
new file mode 100644
index 0000000..923f2b6
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen3.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_gen3">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen3_4.xml b/src/xml/escp2/inks/photo_gen3_4.xml
new file mode 100644
index 0000000..fb85d5e
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen3_4.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_gen3_4">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen4.xml b/src/xml/escp2/inks/photo_gen4.xml
new file mode 100644
index 0000000..6c08316
--- /dev/null
+++ b/src/xml/escp2/inks/photo_gen4.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_gen3">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/photo_pigment.xml b/src/xml/escp2/inks/photo_pigment.xml
new file mode 100644
index 0000000..c5d047b
--- /dev/null
+++ b/src/xml/escp2/inks/photo_pigment.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="photo_pigment">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/picturemate_4.xml b/src/xml/escp2/inks/picturemate_4.xml
new file mode 100644
index 0000000..5b1e6fe
--- /dev/null
+++ b/src/xml/escp2/inks/picturemate_4.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="picturemate_4">
+<InkList translate="text" name="picturemate_4" text="Standard">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml
new file mode 100644
index 0000000..9ccb684
--- /dev/null
+++ b/src/xml/escp2/inks/picturemate_6.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="picturemate_6">
+<InkList translate="text" name="picturemate_6" text="Standard">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	0.875	0.7	0.55	0.4	0.3	0.2	0.1
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.125	0.25	0.375	0.5	0.625	0.75	0.875
+	1	1	1	1	1	1	1	1
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0.002	0.05	0.3	0.6	0.8
+	1	1	0.85	0.7	0.6	0.5	0.4	0.3
+	0.2	0.1	0.05	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0.05	0.15
+	0.25	0.35	0.45	0.55	0.65	0.75	0.85	0.95
+	1	1	1	1	1	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_red" index="4">
+    <HueCurveParam name="RedHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0.025	0.4	0.6	0.75	0.89	1	1	1
+	1	0.875	0.75	0.625	0.5	0.375	0.25	0.125
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_blue" index="5">
+    <HueCurveParam name="BlueHueCurve"/>
+    <HueCurve>
+    <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+     <sequence count="48" lower-bound="0" upper-bound="4">
+	0	0.25	0.475	0.7	0.81	0.875	0.94	1
+	1	0.975	0.93	0.875	0.81	0.74	0.65	0.4
+	0.04	0.002	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+     </sequence>
+    </curve>
+    </HueCurve>
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_red" index="4">
+    <subchannel color="7">
+     <ChannelDensityParam name="RedDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_blue" index="5">
+    <subchannel color="8" headOffset="1">
+     <ChannelDensityParam name="BlueDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="picturemate_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_gen1.xml b/src/xml/escp2/inks/pro_gen1.xml
new file mode 100644
index 0000000..9d9dca6
--- /dev/null
+++ b/src/xml/escp2/inks/pro_gen1.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="pro_gen1">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.305000</shade>
+  <shade count="2">1.000000 0.315000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_gen2.xml b/src/xml/escp2/inks/pro_gen2.xml
new file mode 100644
index 0000000..0eaac3a
--- /dev/null
+++ b/src/xml/escp2/inks/pro_gen2.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="pro_gen2">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="2">1.000000 0.290000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_pigment.xml b/src/xml/escp2/inks/pro_pigment.xml
new file mode 100644
index 0000000..59caecb
--- /dev/null
+++ b/src/xml/escp2/inks/pro_pigment.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="pro_pigment">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="2">1.000000 0.227000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome.xml b/src/xml/escp2/inks/pro_ultrachrome.xml
new file mode 100644
index 0000000..9ef31f3
--- /dev/null
+++ b/src/xml/escp2/inks/pro_ultrachrome.xml
@@ -0,0 +1,775 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="pro_ultrachrome">
+<InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+<Shades>
+ <shade count="2">1.000000 0.480000</shade>
+ <shade count="2">1.000000 0.330000</shade>
+ <shade count="2">1.000000 0.250000</shade>
+ <shade count="1">1.000000</shade>
+ <shade count="1">1.000000</shade>
+ <shade count="1">1.000000</shade>
+ <shade count="1">1.000000</shade>
+</Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="ultramatte" text="UltraChrome Matte Black">
+ <Shades>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3.xml b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
new file mode 100644
index 0000000..8038997
--- /dev/null
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
@@ -0,0 +1,590 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="pro_ultrachrome_k3">
+<InkList translate="text" name="ultra3photo" text="Photo Black">
+ <Shades>
+  <shade count="3">1.000000 0.480000 0.160000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.200000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo3_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="ultra3matte" text="Matte Black">
+ <Shades>
+  <shade count="3">1.000000 0.278000 0.093000</shade>
+  <shade count="2">1.000000 0.350000</shade>
+  <shade count="2">1.000000 0.200000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo3_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360x_photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="4">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="5">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/standard.xml b/src/xml/escp2/inks/standard.xml
new file mode 100644
index 0000000..afd21c4
--- /dev/null
+++ b/src/xml/escp2/inks/standard.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="standard">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/standard_gen0.xml b/src/xml/escp2/inks/standard_gen0.xml
new file mode 100644
index 0000000..7c04253
--- /dev/null
+++ b/src/xml/escp2/inks/standard_gen0.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="standard_gen0">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="quadtone" text="Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="2">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/ultrachrome.xml b/src/xml/escp2/inks/ultrachrome.xml
new file mode 100644
index 0000000..2a3b442
--- /dev/null
+++ b/src/xml/escp2/inks/ultrachrome.xml
@@ -0,0 +1,775 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="ultrachrome">
+<InkList translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+ <Shades>
+  <shade count="2">1.000000 0.480000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="ultramatte" text="UltraChrome Matte Black">
+ <Shades>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.330000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="photo_cyan" index="1">
+    <subchannel color="2" subchannel="0">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_magenta" index="2">
+    <subchannel color="1" subchannel="0">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="3">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
+  <Channels>
+   <channel name="photo2_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="1">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_cyan" index="0">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="1">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="2">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="3">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="4">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="3">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="5">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="photo_black" index="0">
+    <subchannel color="0" subchannel="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="2">
+    <subchannel color="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_cyan" index="3">
+    <subchannel color="2" subchannel="1">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_magenta" index="4">
+    <subchannel color="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="5">
+    <subchannel color="1" subchannel="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="photo_yellow" index="6">
+    <subchannel color="4" subchannel="0">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/wf40.xml b/src/xml/escp2/inks/wf40.xml
new file mode 100644
index 0000000..6bf5a9a
--- /dev/null
+++ b/src/xml/escp2/inks/wf40.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InkGroup name="wf40">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="wf40_black" index="0">
+    <subchannel color="0" subchannel="6">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="3">0 64 96</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="wf40_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="wf40_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="wf40_black" index="0">
+    <subchannel color="0" subchannel="6">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="3">0 64 96</SplitChannels>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="wf40_cyan" index="0">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="wf40_black" index="0">
+    <subchannel color="0" subchannel="6">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SplitChannels count="3">0 64 96</SplitChannels>
+    </subchannel>
+   </channel>
+   <channel name="wf40_cyan" index="1">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="wf40_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/wf500.xml b/src/xml/escp2/inks/wf500.xml
new file mode 100644
index 0000000..5fc2282
--- /dev/null
+++ b/src/xml/escp2/inks/wf500.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:InkGroup name="wf500">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="cx3650_standard_cyan" index="0">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="1">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="cx3650_standard_cyan" index="1">
+    <subchannel color="2" headOffset="2">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <subchannel color="1" headOffset="1">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/x80.xml b/src/xml/escp2/inks/x80.xml
new file mode 100644
index 0000000..6c24d24
--- /dev/null
+++ b/src/xml/escp2/inks/x80.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:InkGroup name="x80">
+<InkList translate="text" name="None" text="EPSON Standard Inks">
+ <Shades>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="x80_black" index="0">
+    <subchannel color="0" headOffset="48">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="x80_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="standard_black" index="0">
+    <subchannel color="0">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="x80_cyan" index="0">
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="1">
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="2">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="x80_black" index="0">
+    <subchannel color="0" headOffset="48">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_cyan" index="1">
+    <subchannel color="2" headOffset="96">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_magenta" index="2">
+    <subchannel color="1" headOffset="48">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="x80_yellow" index="3">
+    <subchannel color="4">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am
new file mode 100644
index 0000000..942922a
--- /dev/null
+++ b/src/xml/escp2/inputslots/Makefile.am
@@ -0,0 +1,50 @@
+## $Id: Makefile.am,v 1.2 2008/06/10 13:10:25 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inputslots
+
+pkgxmldata_DATA =				\
+	b500.xml				\
+	cd_cutter_roll_feed.xml			\
+	cd_roll_feed.xml			\
+	cutter_roll_feed.xml			\
+	default.xml				\
+	pro_roll_feed.xml			\
+	r1800.xml				\
+	r2400.xml				\
+	rx700.xml				\
+	spro5000.xml				\
+	standard_roll_feed.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
new file mode 100644
index 0000000..8f0043f
--- /dev/null
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -0,0 +1,504 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/inputslots
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/inputslots
+pkgxmldata_DATA = \
+	b500.xml				\
+	cd_cutter_roll_feed.xml			\
+	cd_roll_feed.xml			\
+	cutter_roll_feed.xml			\
+	default.xml				\
+	pro_roll_feed.xml			\
+	r1800.xml				\
+	r2400.xml				\
+	rx700.xml				\
+	spro5000.xml				\
+	standard_roll_feed.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/inputslots/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/inputslots/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/inputslots/b500.xml b/src/xml/escp2/inputslots/b500.xml
new file mode 100644
index 0000000..9e9652a
--- /dev/null
+++ b/src/xml/escp2/inputslots/b500.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="b500">
+
+ <slot translate="text" name="Rear" text="Rear Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\000</InitSequence>
+ </slot>
+
+ <slot translate="text" name="Front" text="Front Tray">
+  <Duplex><Tumble/></Duplex>
+  <InitSequence>PP\003\000\000\001\001</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/cd_cutter_roll_feed.xml b/src/xml/escp2/inputslots/cd_cutter_roll_feed.xml
new file mode 100644
index 0000000..cd702fe
--- /dev/null
+++ b/src/xml/escp2/inputslots/cd_cutter_roll_feed.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="cd_cutter_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Manual" text="Manual Feed">
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutPage" text="Roll Feed (cut each page)">
+  <RollFeed><CutAll/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutNone" text="Roll Feed (do not cut)">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/cd_roll_feed.xml b/src/xml/escp2/inputslots/cd_roll_feed.xml
new file mode 100644
index 0000000..259ac2d
--- /dev/null
+++ b/src/xml/escp2/inputslots/cd_roll_feed.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="cd_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Manual" text="Manual Feed">
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/cutter_roll_feed.xml b/src/xml/escp2/inputslots/cutter_roll_feed.xml
new file mode 100644
index 0000000..f316783
--- /dev/null
+++ b/src/xml/escp2/inputslots/cutter_roll_feed.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="cutter_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutPage" text="Roll Feed (cut each page)">
+  <RollFeed><CutAll/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="RollCutNone" text="Roll Feed (do not cut)">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/default.xml b/src/xml/escp2/inputslots/default.xml
new file mode 100644
index 0000000..44e829c
--- /dev/null
+++ b/src/xml/escp2/inputslots/default.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="default"/>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/pro_roll_feed.xml b/src/xml/escp2/inputslots/pro_roll_feed.xml
new file mode 100644
index 0000000..98cf0b7
--- /dev/null
+++ b/src/xml/escp2/inputslots/pro_roll_feed.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="pro_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>PP\003\000\000\002\000</InitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed/>
+  <InitSequence>PP\003\000\000\003\000</InitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/r1800.xml b/src/xml/escp2/inputslots/r1800.xml
new file mode 100644
index 0000000..f8ad994
--- /dev/null
+++ b/src/xml/escp2/inputslots/r1800.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="r1800">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Velvet" text="Manual Sheet Guide">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Matte" text="Manual Feed (Front)">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/r2400.xml b/src/xml/escp2/inputslots/r2400.xml
new file mode 100644
index 0000000..4d94dcf
--- /dev/null
+++ b/src/xml/escp2/inputslots/r2400.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="r2400">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Velvet" text="Manual Sheet Guide">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Matte" text="Manual Feed (Front)">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/rx700.xml b/src/xml/escp2/inputslots/rx700.xml
new file mode 100644
index 0000000..de405dd
--- /dev/null
+++ b/src/xml/escp2/inputslots/rx700.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="rx700">
+
+ <slot translate="text" name="Rear" text="Rear Tray">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Front" text="Front Tray">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="PhotoBoard" text="Photo Board">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/spro5000.xml b/src/xml/escp2/inputslots/spro5000.xml
new file mode 100644
index 0000000..0900d1a
--- /dev/null
+++ b/src/xml/escp2/inputslots/spro5000.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="spro5000">
+
+ <slot translate="text" name="CutSheet1" text="Cut Sheet Bin 1">
+  <InitSequence>PP\003\000\000\001\001</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CutSheet2" text="Cut Sheet Bin 2">
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+ </slot>
+
+ <slot translate="text" name="CutSheetAuto" text="Cut Sheet Autoselect">
+  <InitSequence>PP\003\000\000\001\377</InitSequence>
+ </slot>
+
+ <slot translate="text" name="ManualSelect" text="Manual Selection">
+  <InitSequence>PP\003\000\000\002\001</InitSequence>
+</slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/inputslots/standard_roll_feed.xml b/src/xml/escp2/inputslots/standard_roll_feed.xml
new file mode 100644
index 0000000..818310e
--- /dev/null
+++ b/src/xml/escp2/inputslots/standard_roll_feed.xml
@@ -0,0 +1,36 @@
+ <?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:InputSlots name="standard_roll_feed">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/media/Makefile.am b/src/xml/escp2/media/Makefile.am
new file mode 100644
index 0000000..759b709
--- /dev/null
+++ b/src/xml/escp2/media/Makefile.am
@@ -0,0 +1,75 @@
+## $Id: Makefile.am,v 1.8 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media
+
+pkgxmldata_DATA =				\
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	claria1400.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	r800.xml				\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf500.xml				\
+	x80.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in
new file mode 100644
index 0000000..085fb09
--- /dev/null
+++ b/src/xml/escp2/media/Makefile.in
@@ -0,0 +1,529 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/media
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media
+pkgxmldata_DATA = \
+	b500.xml				\
+	c120.xml				\
+	c64.xml					\
+	c80.xml					\
+	c82.xml					\
+	claria.xml				\
+	claria1400.xml				\
+	cmy.xml					\
+	cmykrb.xml				\
+	cmykro.xml				\
+	cx3650.xml				\
+	f360.xml				\
+	f360_photo.xml				\
+	f360_photo7_japan.xml			\
+	f360_ultrachrome.xml			\
+	f360_ultrachrome_k3.xml			\
+	photo_gen0.xml				\
+	photo_gen1.xml				\
+	photo_gen2.xml				\
+	photo_gen3.xml				\
+	photo_gen3_4.xml			\
+	photo_gen4.xml				\
+	photo_pigment.xml			\
+	picturemate_4.xml			\
+	picturemate_6.xml			\
+	pro_gen1.xml				\
+	pro_gen2.xml				\
+	pro_pigment.xml				\
+	pro_ultrachrome.xml			\
+	pro_ultrachrome_k3.xml			\
+	r800.xml				\
+	standard.xml				\
+	standard_gen0.xml			\
+	ultrachrome.xml				\
+	wf500.xml				\
+	x80.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/media/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/media/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/media/b500.xml b/src/xml/escp2/media/b500.xml
new file mode 100644
index 0000000..198ec4b
--- /dev/null
+++ b/src/xml/escp2/media/b500.xml
@@ -0,0 +1,895 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="b500">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">128</parameter>
+ <parameter type="integer" name="PrintMethod">0x71</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x71</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x720hq">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto170" text="Premium Glossy Photo Paper 170 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">140</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto250" text="Premium Glossy Photo Paper 250 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">137</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss170" text="Premium Semigloss Photo Paper 170 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">141</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss250" text="Premium Semigloss Photo Paper 250 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">138</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Luster250" text="Premium Luster Photo Paper 250 wt" class="premium">
+ <parameter type="integer" name="PaperMedia">139</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0xb0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/c120.xml b/src/xml/escp2/media/c120.xml
new file mode 100644
index 0000000..6905b8a
--- /dev/null
+++ b/src/xml/escp2/media/c120.xml
@@ -0,0 +1,1142 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="c120">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">22</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/c64.xml b/src/xml/escp2/media/c64.xml
new file mode 100644
index 0000000..86698bb
--- /dev/null
+++ b/src/xml/escp2/media/c64.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="c64">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/c80.xml b/src/xml/escp2/media/c80.xml
new file mode 100644
index 0000000..5a3bbc8
--- /dev/null
+++ b/src/xml/escp2/media/c80.xml
@@ -0,0 +1,790 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="c80">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.100000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.100000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo"
+PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium" PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"
+PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo" PreferredInktype="RGB">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/c82.xml b/src/xml/escp2/media/c82.xml
new file mode 100644
index 0000000..0e084c7
--- /dev/null
+++ b/src/xml/escp2/media/c82.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="c82">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/claria.xml b/src/xml/escp2/media/claria.xml
new file mode 100644
index 0000000..101bf57
--- /dev/null
+++ b/src/xml/escp2/media/claria.xml
@@ -0,0 +1,1261 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="claria">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.3	-0.35	-0.38	-0.4	-0.42	-0.46	-0.49	-0.52
+	-0.55	-0.57	-0.57	-0.55	-0.52	-0.48	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	-0.02	-0.04	-0.08	-0.13
+	-0.18	-0.18	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.66	0.67	0.69	0.73	0.77	0.83	0.87	0.89
+	0.91	0.88	0.84	0.78	0.78	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	0.99	0.98	0.96	0.94	0.92	0.88
+	0.84	0.72	0.69	0.67	0.66	0.66	0.66	0.66
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/claria1400.xml b/src/xml/escp2/media/claria1400.xml
new file mode 100644
index 0000000..94da1cb
--- /dev/null
+++ b/src/xml/escp2/media/claria1400.xml
@@ -0,0 +1,1260 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="claria">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.3	-0.35	-0.38	-0.4	-0.42	-0.46	-0.49	-0.52
+	-0.55	-0.57	-0.57	-0.55	-0.52	-0.48	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	-0.02	-0.04	-0.08	-0.13
+	-0.18	-0.18	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.66	0.67	0.69	0.73	0.77	0.83	0.87	0.89
+	0.91	0.88	0.84	0.78	0.78	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	0.99	0.98	0.96	0.94	0.92	0.88
+	0.84	0.72	0.69	0.67	0.66	0.66	0.66	0.66
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x54</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x54</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/cmy.xml b/src/xml/escp2/media/cmy.xml
new file mode 100644
index 0000000..300da1e
--- /dev/null
+++ b/src/xml/escp2/media/cmy.xml
@@ -0,0 +1,446 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="cmy">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/cmykrb.xml b/src/xml/escp2/media/cmykrb.xml
new file mode 100644
index 0000000..22ed8c0
--- /dev/null
+++ b/src/xml/escp2/media/cmykrb.xml
@@ -0,0 +1,1466 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="cmykrb">
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="cmykrbPhotoHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0.02	0.02
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.78	0.78	0.82	0.85	0.92
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">16</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x23</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="r800Matte">
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/cmykro.xml b/src/xml/escp2/media/cmykro.xml
new file mode 100644
index 0000000..f923a3a
--- /dev/null
+++ b/src/xml/escp2/media/cmykro.xml
@@ -0,0 +1,1468 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="cmykro">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="cmykroPhotoHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.35	-0.25	-0.17	-0.10	-0.06	-0.03	-0.00	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroPhotoLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.82	0.85	0.88	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroPhotoSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroMatteHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0.02	0.02
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroMatteLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.78	0.78	0.82	0.85	0.92
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykroMatteSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">29</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">43</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">16</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">43</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="r800Matte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="r800Photo">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x52</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb0</parameter>
+ </resolution>
+
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="r800Matte">
+ <ink translate="text" name="cmykrophoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykromatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykroMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykroMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykroMatteSat"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/cx3650.xml b/src/xml/escp2/media/cx3650.xml
new file mode 100644
index 0000000..07d5ea0
--- /dev/null
+++ b/src/xml/escp2/media/cx3650.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="cx3650">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360.xml b/src/xml/escp2/media/f360.xml
new file mode 100644
index 0000000..574d0fb
--- /dev/null
+++ b/src/xml/escp2/media/f360.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="f360">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.800000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_photo.xml b/src/xml/escp2/media/f360_photo.xml
new file mode 100644
index 0000000..375d452
--- /dev/null
+++ b/src/xml/escp2/media/f360_photo.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="f360_photo">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.58	0.63	0.7	0.75	0.8	0.86	0.88	0.9
+	0.9	0.83	0.78	0.78	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.58	0.6	0.65	0.69	0.74	0.79	0.82	0.84
+	0.86	0.81	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_photo7_japan.xml b/src/xml/escp2/media/f360_photo7_japan.xml
new file mode 100644
index 0000000..eec937c
--- /dev/null
+++ b/src/xml/escp2/media/f360_photo7_japan.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="f360_photo7_japan">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.58	0.63	0.7	0.75	0.8	0.86	0.88	0.9
+	0.9	0.83	0.78	0.78	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.23	-0.24	-0.25	-0.26	-0.27
+	-0.28	-0.33	-0.38	-0.45	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.58	0.6	0.65	0.69	0.74	0.79	0.82	0.84
+	0.86	0.81	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.98	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	0.99	0.98	0.97	0.96	0.94	0.93	0.89
+	0.86	0.73	0.65	0.58	0.59	0.59	0.58	0.58
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.900000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.860000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.200000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_ultrachrome.xml b/src/xml/escp2/media/f360_ultrachrome.xml
new file mode 100644
index 0000000..5a0bdbd
--- /dev/null
+++ b/src/xml/escp2/media/f360_ultrachrome.xml
@@ -0,0 +1,918 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="f360_ultrachrome">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ </paper>
+
+ <paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White"
+ class="premium" PreferredInkset="UltraMatte">
+  <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/f360_ultrachrome_k3.xml b/src/xml/escp2/media/f360_ultrachrome_k3.xml
new file mode 100644
index 0000000..770816d
--- /dev/null
+++ b/src/xml/escp2/media/f360_ultrachrome_k3.xml
@@ -0,0 +1,1468 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="f360_ultrachrome_k3">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.17	-0.18
+	-0.19	-0.2	-0.19	-0.18	-0.16	-0.12	-0.08	-0.04
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.55	0.57	0.61	0.64	0.67	0.69	0.72	0.75
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.93	0.91	0.88	0.83
+	0.83	0.71	0.65	0.61	0.58	0.56	0.55	0.55
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.55	0.57	0.61	0.64	0.67	0.69	0.72	0.75
+	0.75	0.71	0.7	0.7	0.72	0.76	0.81	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.71	0.65	0.61	0.58	0.56	0.55	0.55
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ </paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x74</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x51</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="UltraMatte">
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.950000</parameter>
+  <parameter type="float" name="YellowBalance">0.900000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen0.xml b/src/xml/escp2/media/photo_gen0.xml
new file mode 100644
index 0000000..71c858f
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen0.xml
@@ -0,0 +1,769 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_gen0">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.375000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen1.xml b/src/xml/escp2/media/photo_gen1.xml
new file mode 100644
index 0000000..aa2c0fd
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen1.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_gen1">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.375000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen2.xml b/src/xml/escp2/media/photo_gen2.xml
new file mode 100644
index 0000000..9f042cb
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen2.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_gen2">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.200000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.890000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen3.xml b/src/xml/escp2/media/photo_gen3.xml
new file mode 100644
index 0000000..1b5fbdc
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen3.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_gen3">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.28	-0.3	-0.34	-0.35	-0.35	-0.34	-0.33	-0.33
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	-0.02	-0.04	-0.08	-0.13
+	-0.18	-0.18	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.66	0.67	0.69	0.73	0.77	0.83	0.87	0.89
+	0.91	0.88	0.82	0.78	0.78	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	0.99	0.98	0.96	0.94	0.92	0.88
+	0.84	0.72	0.69	0.67	0.66	0.66	0.66	0.66
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.670000</parameter>
+  <parameter type="float" name="YellowBalance">0.720000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.450000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.760000</parameter>
+  <parameter type="float" name="YellowBalance">0.840000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">1.050000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.500000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen3_4.xml b/src/xml/escp2/media/photo_gen3_4.xml
new file mode 100644
index 0000000..3aee075
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen3_4.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_gen3_4">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.28	-0.3	-0.34	-0.35	-0.35	-0.34	-0.33	-0.33
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	-0.02	-0.04	-0.08	-0.13
+	-0.18	-0.18	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.66	0.67	0.69	0.73	0.77	0.83	0.87	0.89
+	0.91	0.88	0.82	0.78	0.78	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	0.99	0.98	0.96	0.94	0.92	0.88
+	0.84	0.72	0.69	0.67	0.66	0.66	0.66	0.66
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.670000</parameter>
+  <parameter type="float" name="YellowBalance">0.720000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.450000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.760000</parameter>
+  <parameter type="float" name="YellowBalance">0.840000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">1.050000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.500000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen4.xml b/src/xml/escp2/media/photo_gen4.xml
new file mode 100644
index 0000000..4b158cf
--- /dev/null
+++ b/src/xml/escp2/media/photo_gen4.xml
@@ -0,0 +1,1003 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_gen4">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.28	-0.3	-0.34	-0.35	-0.35	-0.34	-0.33	-0.33
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	-0.02	-0.04	-0.08	-0.13
+	-0.18	-0.18	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.66	0.67	0.69	0.73	0.77	0.83	0.87	0.89
+	0.91	0.88	0.82	0.78	0.78	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	0.99	0.98	0.96	0.94	0.92	0.88
+	0.84	0.72	0.69	0.67	0.66	0.66	0.66	0.66
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.670000</parameter>
+  <parameter type="float" name="YellowBalance">0.720000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x40</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x70</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.450000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.760000</parameter>
+  <parameter type="float" name="YellowBalance">0.840000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">1.050000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.660000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x72</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x90</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x11</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x22</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x42</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x81</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x91</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.590000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.350000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.500000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.850000</parameter>
+  <parameter type="float" name="YellowBalance">0.850000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_pigment.xml b/src/xml/escp2/media/photo_pigment.xml
new file mode 100644
index 0000000..ebfea31
--- /dev/null
+++ b/src/xml/escp2/media/photo_pigment.xml
@@ -0,0 +1,547 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="photo_pigment">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White"
+class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/picturemate_4.xml b/src/xml/escp2/media/picturemate_4.xml
new file mode 100644
index 0000000..1cf7b8f
--- /dev/null
+++ b/src/xml/escp2/media/picturemate_4.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="picturemate_4">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="picturematePhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="picturemate_4" text="Standard">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain"
+PreferredInkset="picturemateMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="picturemate_4" text="Standard">
+  <parameter type="float" name="Density">0.878000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/picturemate_6.xml b/src/xml/escp2/media/picturemate_6.xml
new file mode 100644
index 0000000..5d55fb4
--- /dev/null
+++ b/src/xml/escp2/media/picturemate_6.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="picturemate_6">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="picturematePhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="picturemate_6" text="Standard">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain"
+PreferredInkset="picturemateMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="picturemate_6" text="Standard">
+  <parameter type="float" name="Density">0.878000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/pro_gen1.xml b/src/xml/escp2/media/pro_gen1.xml
new file mode 100644
index 0000000..852e535
--- /dev/null
+++ b/src/xml/escp2/media/pro_gen1.xml
@@ -0,0 +1,809 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="pro_gen1">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.375000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.350000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/pro_gen2.xml b/src/xml/escp2/media/pro_gen2.xml
new file mode 100644
index 0000000..958e667
--- /dev/null
+++ b/src/xml/escp2/media/pro_gen2.xml
@@ -0,0 +1,828 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="pro_gen2">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.200000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.890000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.300000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">0.980000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.900000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.250000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.738000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/pro_pigment.xml b/src/xml/escp2/media/pro_pigment.xml
new file mode 100644
index 0000000..ba1df50
--- /dev/null
+++ b/src/xml/escp2/media/pro_pigment.xml
@@ -0,0 +1,588 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="pro_pigment">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White"
+class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/pro_ultrachrome.xml b/src/xml/escp2/media/pro_ultrachrome.xml
new file mode 100644
index 0000000..fef1cd1
--- /dev/null
+++ b/src/xml/escp2/media/pro_ultrachrome.xml
@@ -0,0 +1,941 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="pro_ultrachrome">
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<feature name="PaperThickness"/><feature name="VacuumIntensity"/><feature
+name="FeedAdjustment"/>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ </paper>
+
+ <paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="Ultramatte">
+  <parameter type="integer" name="PaperThickness">2</parameter>
+  <parameter type="integer" name="VacuumIntensity">0</parameter>
+  <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="Ultraphoto">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="Ultramatte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/pro_ultrachrome_k3.xml b/src/xml/escp2/media/pro_ultrachrome_k3.xml
new file mode 100644
index 0000000..8d0cdd4
--- /dev/null
+++ b/src/xml/escp2/media/pro_ultrachrome_k3.xml
@@ -0,0 +1,942 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="pro_ultrachrome">
+<feature name="PaperThickness"/>
+<feature name="VacuumIntensity"/>
+<feature name="FeedAdjustment"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">109</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ </paper>
+
+ <paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="Ultra3matte">
+  <parameter type="integer" name="PaperThickness">2</parameter>
+  <parameter type="integer" name="VacuumIntensity">0</parameter>
+  <parameter type="integer" name="FeedAdjustment">0</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">128</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="Ultra3photo">
+ <parameter type="integer" name="PaperThickness">2</parameter>
+ <parameter type="integer" name="VacuumIntensity">0</parameter>
+ <parameter type="integer" name="FeedAdjustment">103</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="Ultra3matte">
+ <parameter type="integer" name="PaperThickness">1</parameter>
+ <parameter type="integer" name="VacuumIntensity">26</parameter>
+ <parameter type="integer" name="FeedAdjustment">107</parameter>
+
+ <ink translate="text" name="ultra3photo" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/r800.xml b/src/xml/escp2/media/r800.xml
new file mode 100644
index 0000000..6634d10
--- /dev/null
+++ b/src/xml/escp2/media/r800.xml
@@ -0,0 +1,837 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="r800">
+<Curves>
+ <namedParam name="cmykrbPhotoHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.85	0.87	0.89	0.91	0.95
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbPhotoSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteHue">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.07	-0.1	-0.15	-0.19	-0.25	-0.3	-0.35
+	-0.38	-0.38	-0.3	-0.2	-0.1	0	0.02	0.02
+	0	0	0	0	0	0	0	0
+	0	0	0	0	0	0	0	0
+	0	0.02	0.05	0.09	0.13	0.15	0.16	0.17
+	0.17	0.17	0.16	0.15	0.13	0.09	0.05	0.02
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteLum">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.75	0.75	0.75	0.75	0.76	0.8	0.85	0.9
+	0.9	0.88	0.82	0.78	0.78	0.82	0.85	0.92
+	0.98	0.98	0.97	0.97	0.96	0.96	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	1	1	0.99	0.98	0.97	0.96	0.93
+	0.88	0.87	0.86	0.85	0.82	0.79	0.76	0.75
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="cmykrbMatteSat">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.03	1.06	1.09	1.12	1.15	1.18	1.2
+	1.2	1.15	1.1	1.05	1	1	1	1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.600000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">2.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.546000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="r800Matte">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="r800Photo">
+
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="r800Matte">
+ <ink translate="text" name="cmykrbphoto" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.020000</parameter>
+  <parameter type="float" name="GCRUpper">1.400000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbPhotoHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbPhotoLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbPhotoSat"/>
+ </ink>
+
+ <ink translate="text" name="cmykrbmatte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.025000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">0.882000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">0.250000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="cmykrbMatteHue"/>
+  <parameter type="curve" name="LumMap" ref="cmykrbMatteLum"/>
+  <parameter type="curve" name="SatMap" ref="cmykrbMatteSat"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/standard.xml b/src/xml/escp2/media/standard.xml
new file mode 100644
index 0000000..c70d443
--- /dev/null
+++ b/src/xml/escp2/media/standard.xml
@@ -0,0 +1,788 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="standard">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/standard_gen0.xml b/src/xml/escp2/media/standard_gen0.xml
new file mode 100644
index 0000000..49141f1
--- /dev/null
+++ b/src/xml/escp2/media/standard_gen0.xml
@@ -0,0 +1,769 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="standard_gen0">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="quadtone" text="Quadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/ultrachrome.xml b/src/xml/escp2/media/ultrachrome.xml
new file mode 100644
index 0000000..2c093f1
--- /dev/null
+++ b/src/xml/escp2/media/ultrachrome.xml
@@ -0,0 +1,918 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="ultrachrome">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.51	0.55	0.61	0.67	0.71	0.76	0.79
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.94	0.93	0.9	0.86
+	0.82	0.69	0.6	0.54	0.52	0.51	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.49	0.53	0.6	0.64	0.69	0.73	0.77	0.8
+	0.84	0.81	0.77	0.77	0.78	0.8	0.84	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.69	0.61	0.55	0.53	0.52	0.5	0.49
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">1.250000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.800000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ </paper>
+
+ <paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White"
+ class="premium" PreferredInkset="UltraMatte">
+  <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium"
+PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain"
+PreferredInkset="UltraMatte">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="ultraphoto" text="UltraChrome Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.010000</parameter>
+  <parameter type="float" name="GCRUpper">1.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultramatte" text="UltraChrome Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/wf500.xml b/src/xml/escp2/media/wf500.xml
new file mode 100644
index 0000000..4a92aac
--- /dev/null
+++ b/src/xml/escp2/media/wf500.xml
@@ -0,0 +1,1142 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="c120">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.36	-0.37	-0.38	-0.39
+	-0.4	-0.45	-0.5	-0.52	-0.52	-0.5	-0.45	-0.4
+	-0.35	-0.27	-0.15	-0.06	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.63	0.64	0.66	0.69	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.68	0.65	0.64	0.63	0.63	0.63
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x20</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x20</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">37</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x30</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.850000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.975000</parameter>
+  <parameter type="float" name="YellowBalance">0.975000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x30</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x00</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.850000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.800000</parameter>
+  <parameter type="float" name="YellowBalance">0.800000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">22</parameter>
+ <parameter type="integer" name="PrintMethod">0x32</parameter>
+
+ <resolution name="360x120sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720x360hq">
+  <parameter type="integer" name="PrintMethod">0x32</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="720hq">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x61</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xc0</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.050000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/x80.xml b/src/xml/escp2/media/x80.xml
new file mode 100644
index 0000000..4aa8a8f
--- /dev/null
+++ b/src/xml/escp2/media/x80.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:papers name="x80">
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0	0	-0.02	-0.04	-0.08	-0.12	-0.16
+	-0.2	-0.24	-0.28	-0.32	-0.32	-0.32	-0.32	-0.32
+	-0.36	-0.4	-0.44	-0.48	-0.5	-0.45	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.06	-0.09	-0.13	-0.17	-0.21
+	-0.25	-0.22	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.56	0.58	0.62	0.68	0.73	0.78	0.82	0.85
+	0.85	0.82	0.78	0.78	0.79	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	1	0.99	0.98	0.97	0.95	0.93
+	0.9	0.76	0.65	0.58	0.58	0.57	0.56	0.56
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1.2	1.2	1.3	1.5	1.7	1.9	2	2
+	2	2	2	2	2	2	2	2
+	2	1.8	1.6	1.4	1.2	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.15	1.4	1.7	2	2.3	2.4	2.4
+	2.4	2.4	2.4	2.3	2	1.7	1.4	1.15
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="FeedSequence">1</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
+ <parameter type="integer" name="FeedSequence">5</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="FeedSequence">2</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="FeedSequence">3</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="FeedSequence">4</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="FeedSequence">7</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
+class="premium">
+ <parameter type="integer" name="FeedSequence">6</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="FeedSequence">8</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+ <parameter type="integer" name="FeedSequence">0</parameter>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/mediasizes/Makefile.am b/src/xml/escp2/mediasizes/Makefile.am
new file mode 100644
index 0000000..f458520
--- /dev/null
+++ b/src/xml/escp2/mediasizes/Makefile.am
@@ -0,0 +1,40 @@
+## $Id: Makefile.am,v 1.2 2008/06/10 13:10:51 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/mediasizes
+
+pkgxmldata_DATA =				\
+	standard.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/mediasizes/Makefile.in b/src/xml/escp2/mediasizes/Makefile.in
new file mode 100644
index 0000000..5b7c459
--- /dev/null
+++ b/src/xml/escp2/mediasizes/Makefile.in
@@ -0,0 +1,494 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/mediasizes
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/mediasizes
+pkgxmldata_DATA = \
+	standard.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/mediasizes/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/mediasizes/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/mediasizes/standard.xml b/src/xml/escp2/mediasizes/standard.xml
new file mode 100644
index 0000000..31cc7e0
--- /dev/null
+++ b/src/xml/escp2/mediasizes/standard.xml
@@ -0,0 +1,118 @@
+<?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:MediaSizes name="default">
+ <MediaSize type="sheet" name="A4">
+  <parameter type="integer" name="PaperMediaSize">0</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Letter">
+  <parameter type="integer" name="PaperMediaSize">1</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Legal">
+  <parameter type="integer" name="PaperMediaSize">2</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A5">
+  <parameter type="integer" name="PaperMediaSize">3</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A6">
+  <parameter type="integer" name="PaperMediaSize">4</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="B5">
+  <parameter type="integer" name="PaperMediaSize">5</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Executive">
+  <parameter type="integer" name="PaperMediaSize">6</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Statement">
+  <parameter type="integer" name="PaperMediaSize">7</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w324h495">
+  <parameter type="integer" name="PaperMediaSize">9</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w288h432">
+  <parameter type="integer" name="PaperMediaSize">10</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w360h576">
+  <parameter type="integer" name="PaperMediaSize">11</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="c8x10">
+  <parameter type="integer" name="PaperMediaSize">12</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w283h425">
+  <parameter type="integer" name="PaperMediaSize">13</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w566h850">
+  <parameter type="integer" name="PaperMediaSize">14</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w252h360">
+  <parameter type="integer" name="PaperMediaSize">15</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="COM10_l">
+  <parameter type="integer" name="PaperMediaSize">18</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="C6_l">
+  <parameter type="integer" name="PaperMediaSize">19</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="DL_l">
+  <parameter type="integer" name="PaperMediaSize">20</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w360h504">
+  <parameter type="integer" name="PaperMediaSize">28</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="COM10">
+  <parameter type="integer" name="PaperMediaSize">29</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="C6">
+  <parameter type="integer" name="PaperMediaSize">30</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="DL">
+  <parameter type="integer" name="PaperMediaSize">31</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="SuperB">
+  <parameter type="integer" name="PaperMediaSize">61</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A3">
+  <parameter type="integer" name="PaperMediaSize">62</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="B4">
+  <parameter type="integer" name="PaperMediaSize">63</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="Tabloid">
+  <parameter type="integer" name="PaperMediaSize">64</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="w792h1008">
+  <parameter type="integer" name="PaperMediaSize">65</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="B3">
+  <parameter type="integer" name="PaperMediaSize">66</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="A2">
+  <parameter type="integer" name="PaperMediaSize">67</parameter>
+ </MediaSize>
+ <MediaSize type="sheet" name="EngineeringC">
+  <parameter type="integer" name="PaperMediaSize">68</parameter>
+ </MediaSize>
+ <MediaSize type="default">
+  <parameter type="integer" name="PaperMediaSize">99</parameter>
+ </MediaSize>
+</escp2:MediaSizes>
+</gutenprint>
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
new file mode 100644
index 0000000..9a2c2d0
--- /dev/null
+++ b/src/xml/escp2/model/Makefile.am
@@ -0,0 +1,134 @@
+## $Id: Makefile.am,v 1.9 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/model
+
+pkgxmldata_DATA =				\
+	model_0.xml				\
+	model_1.xml				\
+	model_2.xml				\
+	model_3.xml				\
+	model_4.xml				\
+	model_5.xml				\
+	model_6.xml				\
+	model_7.xml				\
+	model_8.xml				\
+	model_9.xml				\
+	model_10.xml				\
+	model_11.xml				\
+	model_12.xml				\
+	model_13.xml				\
+	model_14.xml				\
+	model_15.xml				\
+	model_16.xml				\
+	model_17.xml				\
+	model_18.xml				\
+	model_19.xml				\
+	model_20.xml				\
+	model_21.xml				\
+	model_22.xml				\
+	model_23.xml				\
+	model_24.xml				\
+	model_25.xml				\
+	model_26.xml				\
+	model_27.xml				\
+	model_28.xml				\
+	model_29.xml				\
+	model_30.xml				\
+	model_31.xml				\
+	model_32.xml				\
+	model_33.xml				\
+	model_34.xml				\
+	model_35.xml				\
+	model_36.xml				\
+	model_37.xml				\
+	model_38.xml				\
+	model_39.xml				\
+	model_40.xml				\
+	model_41.xml				\
+	model_42.xml				\
+	model_43.xml				\
+	model_44.xml				\
+	model_45.xml				\
+	model_46.xml				\
+	model_47.xml				\
+	model_48.xml				\
+	model_49.xml				\
+	model_50.xml				\
+	model_51.xml				\
+	model_52.xml				\
+	model_53.xml				\
+	model_54.xml				\
+	model_55.xml				\
+	model_56.xml				\
+	model_57.xml				\
+	model_58.xml				\
+	model_59.xml				\
+	model_60.xml				\
+	model_61.xml				\
+	model_62.xml				\
+	model_63.xml				\
+	model_64.xml				\
+	model_65.xml				\
+	model_66.xml				\
+	model_67.xml				\
+	model_68.xml				\
+	model_69.xml				\
+	model_70.xml				\
+	model_71.xml				\
+	model_72.xml				\
+	model_73.xml				\
+	model_74.xml				\
+	model_75.xml				\
+	model_76.xml				\
+	model_77.xml				\
+	model_78.xml				\
+	model_79.xml				\
+	model_80.xml				\
+	model_81.xml				\
+	model_82.xml				\
+	model_83.xml				\
+	model_84.xml				\
+	model_85.xml				\
+	model_86.xml				\
+	model_87.xml				\
+	model_88.xml				\
+	model_89.xml				\
+	model_90.xml				\
+	model_91.xml				\
+	model_92.xml				\
+	model_93.xml				\
+	model_94.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
new file mode 100644
index 0000000..2dc9783
--- /dev/null
+++ b/src/xml/escp2/model/Makefile.in
@@ -0,0 +1,588 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/model
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/model
+pkgxmldata_DATA = \
+	model_0.xml				\
+	model_1.xml				\
+	model_2.xml				\
+	model_3.xml				\
+	model_4.xml				\
+	model_5.xml				\
+	model_6.xml				\
+	model_7.xml				\
+	model_8.xml				\
+	model_9.xml				\
+	model_10.xml				\
+	model_11.xml				\
+	model_12.xml				\
+	model_13.xml				\
+	model_14.xml				\
+	model_15.xml				\
+	model_16.xml				\
+	model_17.xml				\
+	model_18.xml				\
+	model_19.xml				\
+	model_20.xml				\
+	model_21.xml				\
+	model_22.xml				\
+	model_23.xml				\
+	model_24.xml				\
+	model_25.xml				\
+	model_26.xml				\
+	model_27.xml				\
+	model_28.xml				\
+	model_29.xml				\
+	model_30.xml				\
+	model_31.xml				\
+	model_32.xml				\
+	model_33.xml				\
+	model_34.xml				\
+	model_35.xml				\
+	model_36.xml				\
+	model_37.xml				\
+	model_38.xml				\
+	model_39.xml				\
+	model_40.xml				\
+	model_41.xml				\
+	model_42.xml				\
+	model_43.xml				\
+	model_44.xml				\
+	model_45.xml				\
+	model_46.xml				\
+	model_47.xml				\
+	model_48.xml				\
+	model_49.xml				\
+	model_50.xml				\
+	model_51.xml				\
+	model_52.xml				\
+	model_53.xml				\
+	model_54.xml				\
+	model_55.xml				\
+	model_56.xml				\
+	model_57.xml				\
+	model_58.xml				\
+	model_59.xml				\
+	model_60.xml				\
+	model_61.xml				\
+	model_62.xml				\
+	model_63.xml				\
+	model_64.xml				\
+	model_65.xml				\
+	model_66.xml				\
+	model_67.xml				\
+	model_68.xml				\
+	model_69.xml				\
+	model_70.xml				\
+	model_71.xml				\
+	model_72.xml				\
+	model_73.xml				\
+	model_74.xml				\
+	model_75.xml				\
+	model_76.xml				\
+	model_77.xml				\
+	model_78.xml				\
+	model_79.xml				\
+	model_80.xml				\
+	model_81.xml				\
+	model_82.xml				\
+	model_83.xml				\
+	model_84.xml				\
+	model_85.xml				\
+	model_86.xml				\
+	model_87.xml				\
+	model_88.xml				\
+	model_89.xml				\
+	model_90.xml				\
+	model_91.xml				\
+	model_92.xml				\
+	model_93.xml				\
+	model_94.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/model/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/model/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/model/model_0.xml b/src/xml/escp2/model/model_0.xml
new file mode 100644
index 0000000..4cc765e
--- /dev/null
+++ b/src/xml/escp2/model/model_0.xml
@@ -0,0 +1,126 @@
+<?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="0">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_1.xml b/src/xml/escp2/model/model_1.xml
new file mode 100644
index 0000000..a1dc62b
--- /dev/null
+++ b/src/xml/escp2/model/model_1.xml
@@ -0,0 +1,144 @@
+<?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="1">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x120dpi" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240dpi" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_10.xml b/src/xml/escp2/model/model_10.xml
new file mode 100644
index 0000000..a1a2630
--- /dev/null
+++ b/src/xml/escp2/model/model_10.xml
@@ -0,0 +1,146 @@
+<?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="10">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>21</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_11.xml b/src/xml/escp2/model/model_11.xml
new file mode 100644
index 0000000..0241387
--- /dev/null
+++ b/src/xml/escp2/model/model_11.xml
@@ -0,0 +1,145 @@
+<?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="11">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.900000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.450000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.450000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_12.xml b/src/xml/escp2/model/model_12.xml
new file mode 100644
index 0000000..52491fe
--- /dev/null
+++ b/src/xml/escp2/model/model_12.xml
@@ -0,0 +1,159 @@
+<?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="12">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_13.xml b/src/xml/escp2/model/model_13.xml
new file mode 100644
index 0000000..18f1b60
--- /dev/null
+++ b/src/xml/escp2/model/model_13.xml
@@ -0,0 +1,162 @@
+<?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="13">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.675000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.730000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.610000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.730000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.610000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">180</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">180</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_14.xml b/src/xml/escp2/model/model_14.xml
new file mode 100644
index 0000000..f4db1ed
--- /dev/null
+++ b/src/xml/escp2/model/model_14.xml
@@ -0,0 +1,151 @@
+<?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="14">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_15.xml b/src/xml/escp2/model/model_15.xml
new file mode 100644
index 0000000..b905452
--- /dev/null
+++ b/src/xml/escp2/model/model_15.xml
@@ -0,0 +1,151 @@
+<?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="15">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_16.xml b/src/xml/escp2/model/model_16.xml
new file mode 100644
index 0000000..ba8a29e
--- /dev/null
+++ b/src/xml/escp2/model/model_16.xml
@@ -0,0 +1,164 @@
+<?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="16">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_17.xml b/src/xml/escp2/model/model_17.xml
new file mode 100644
index 0000000..44b347f
--- /dev/null
+++ b/src/xml/escp2/model/model_17.xml
@@ -0,0 +1,164 @@
+<?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="17">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_18.xml b/src/xml/escp2/model/model_18.xml
new file mode 100644
index 0000000..4e8619f
--- /dev/null
+++ b/src/xml/escp2/model/model_18.xml
@@ -0,0 +1,148 @@
+<?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="18">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 26</margins>
+ <margins interleave="soft" media="roll">9 9 9 0</margins>
+ <margins interleave="printer" media="roll">9 9 9 0</margins>
+ <AlignmentChoices>1 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.646000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.323000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.323000</parameter>
+   <parameter type="integer" name="escp2_ink_type">0</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_19.xml b/src/xml/escp2/model/model_19.xml
new file mode 100644
index 0000000..a6d6f3d
--- /dev/null
+++ b/src/xml/escp2/model/model_19.xml
@@ -0,0 +1,164 @@
+<?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="19">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_2.xml b/src/xml/escp2/model/model_2.xml
new file mode 100644
index 0000000..c7502c6
--- /dev/null
+++ b/src/xml/escp2/model/model_2.xml
@@ -0,0 +1,144 @@
+<?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="2">
+ <media src="escp2/media/cmy.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/cmy.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 3168</maximumMediaSize>
+ <maximumImageableArea>1224 3168</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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x120dpi" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240dpi" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.631000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_20.xml b/src/xml/escp2/model/model_20.xml
new file mode 100644
index 0000000..681c1a7
--- /dev/null
+++ b/src/xml/escp2/model/model_20.xml
@@ -0,0 +1,161 @@
+<?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="20">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_21.xml b/src/xml/escp2/model/model_21.xml
new file mode 100644
index 0000000..a3146df
--- /dev/null
+++ b/src/xml/escp2/model/model_21.xml
@@ -0,0 +1,157 @@
+<?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="21">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <maxBlackResolution>360</maxBlackResolution>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_22.xml b/src/xml/escp2/model/model_22.xml
new file mode 100644
index 0000000..387ad1f
--- /dev/null
+++ b/src/xml/escp2/model/model_22.xml
@@ -0,0 +1,155 @@
+<?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="22">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_23.xml b/src/xml/escp2/model/model_23.xml
new file mode 100644
index 0000000..d0d93bc
--- /dev/null
+++ b/src/xml/escp2/model/model_23.xml
@@ -0,0 +1,155 @@
+<?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="23">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.330000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_24.xml b/src/xml/escp2/model/model_24.xml
new file mode 100644
index 0000000..a2722b1
--- /dev/null
+++ b/src/xml/escp2/model/model_24.xml
@@ -0,0 +1,143 @@
+<?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="24">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 3168</maximumMediaSize>
+ <maximumImageableArea>1224 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 9 40</margins>
+ <margins interleave="printer" media="sheet">8 9 9 40</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_25.xml b/src/xml/escp2/model/model_25.xml
new file mode 100644
index 0000000..101c713
--- /dev/null
+++ b/src/xml/escp2/model/model_25.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="25">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_26.xml b/src/xml/escp2/model/model_26.xml
new file mode 100644
index 0000000..28ca114
--- /dev/null
+++ b/src/xml/escp2/model/model_26.xml
@@ -0,0 +1,157 @@
+<?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="26">
+ <media src="escp2/media/photo_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_pigment.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>2 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.852000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.852000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.438000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.438000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_27.xml b/src/xml/escp2/model/model_27.xml
new file mode 100644
index 0000000..ee67a94
--- /dev/null
+++ b/src/xml/escp2/model/model_27.xml
@@ -0,0 +1,132 @@
+<?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="27">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/spro5000.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>4</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_28.xml b/src/xml/escp2/model/model_28.xml
new file mode 100644
index 0000000..51d2496
--- /dev/null
+++ b/src/xml/escp2/model/model_28.xml
@@ -0,0 +1,130 @@
+<?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="28">
+ <media src="escp2/media/pro_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_gen1.xml"/>
+ <printerWeaves src="escp2/weaves/pro7000.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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_29.xml b/src/xml/escp2/model/model_29.xml
new file mode 100644
index 0000000..767d65d
--- /dev/null
+++ b/src/xml/escp2/model/model_29.xml
@@ -0,0 +1,130 @@
+<?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="29">
+ <media src="escp2/media/pro_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_pigment.xml"/>
+ <printerWeaves src="escp2/weaves/pro7500.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</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="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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_3.xml b/src/xml/escp2/model/model_3.xml
new file mode 100644
index 0000000..aa6198c
--- /dev/null
+++ b/src/xml/escp2/model/model_3.xml
@@ -0,0 +1,151 @@
+<?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="3">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 0 30</margins>
+ <margins interleave="printer" media="sheet">8 9 0 30</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_30.xml b/src/xml/escp2/model/model_30.xml
new file mode 100644
index 0000000..a9a3b5e
--- /dev/null
+++ b/src/xml/escp2/model/model_30.xml
@@ -0,0 +1,130 @@
+<?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="30">
+ <media src="escp2/media/pro_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_gen1.xml"/>
+ <printerWeaves src="escp2/weaves/pro7000.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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_31.xml b/src/xml/escp2/model/model_31.xml
new file mode 100644
index 0000000..c512354
--- /dev/null
+++ b/src/xml/escp2/model/model_31.xml
@@ -0,0 +1,130 @@
+<?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="31">
+ <media src="escp2/media/pro_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_pigment.xml"/>
+ <printerWeaves src="escp2/weaves/pro7500.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</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="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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_32.xml b/src/xml/escp2/model/model_32.xml
new file mode 100644
index 0000000..1e27a53
--- /dev/null
+++ b/src/xml/escp2/model/model_32.xml
@@ -0,0 +1,170 @@
+<?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="32">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_33.xml b/src/xml/escp2/model/model_33.xml
new file mode 100644
index 0000000..ec3bdfc
--- /dev/null
+++ b/src/xml/escp2/model/model_33.xml
@@ -0,0 +1,170 @@
+<?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="33">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_34.xml b/src/xml/escp2/model/model_34.xml
new file mode 100644
index 0000000..5ed9669
--- /dev/null
+++ b/src/xml/escp2/model/model_34.xml
@@ -0,0 +1,169 @@
+<?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="34">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <extraVerticalFeed>38</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.580000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.675000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.511000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.610000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.490000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.490000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.390000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.637000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.637000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_35.xml b/src/xml/escp2/model/model_35.xml
new file mode 100644
index 0000000..d31cd5e
--- /dev/null
+++ b/src/xml/escp2/model/model_35.xml
@@ -0,0 +1,164 @@
+<?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="35">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\000\002SN\003\000\000\001\001SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_36.xml b/src/xml/escp2/model/model_36.xml
new file mode 100644
index 0000000..54053d8
--- /dev/null
+++ b/src/xml/escp2/model/model_36.xml
@@ -0,0 +1,164 @@
+<?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="36">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\000\010SN\003\000\000\001\001SN\003\000\000\002\000SN\003\000\000\007\000SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_37.xml b/src/xml/escp2/model/model_37.xml
new file mode 100644
index 0000000..21f5bb3
--- /dev/null
+++ b/src/xml/escp2/model/model_37.xml
@@ -0,0 +1,164 @@
+<?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="37">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_38.xml b/src/xml/escp2/model/model_38.xml
new file mode 100644
index 0000000..b76194a
--- /dev/null
+++ b/src/xml/escp2/model/model_38.xml
@@ -0,0 +1,165 @@
+<?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="38">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <maxBlackResolution>360</maxBlackResolution>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_39.xml b/src/xml/escp2/model/model_39.xml
new file mode 100644
index 0000000..83e2400
--- /dev/null
+++ b/src/xml/escp2/model/model_39.xml
@@ -0,0 +1,125 @@
+<?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="39">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>16</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_4.xml b/src/xml/escp2/model/model_4.xml
new file mode 100644
index 0000000..b683fc8
--- /dev/null
+++ b/src/xml/escp2/model/model_4.xml
@@ -0,0 +1,142 @@
+<?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="4">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 9 40</margins>
+ <margins interleave="printer" media="sheet">8 9 9 40</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_40.xml b/src/xml/escp2/model/model_40.xml
new file mode 100644
index 0000000..f714b0a
--- /dev/null
+++ b/src/xml/escp2/model/model_40.xml
@@ -0,0 +1,130 @@
+<?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="40">
+ <media src="escp2/media/pro_pigment.xml"/>
+ <inputSlots src="escp2/inputslots/spro5000.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_pigment.xml"/>
+ <printerWeaves src="escp2/weaves/pro7500.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</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="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</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="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</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_41.xml b/src/xml/escp2/model/model_41.xml
new file mode 100644
index 0000000..459c7c1
--- /dev/null
+++ b/src/xml/escp2/model/model_41.xml
@@ -0,0 +1,137 @@
+<?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="41">
+ <media src="escp2/media/pro_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_gen2.xml"/>
+ <printerWeaves src="escp2/weaves/pro7000.xml"/>
+ <commandSet>Pro</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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 9 9</margins>
+ <margins interleave="printer" media="roll">9 9 9 9</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <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">1.300000</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.661000</parameter>
+   <parameter type="float" name="DropSize2">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">0.650000</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.661000</parameter>
+   <parameter type="float" name="DropSize2">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">0.431000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.216000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.661000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_42.xml b/src/xml/escp2/model/model_42.xml
new file mode 100644
index 0000000..d975822
--- /dev/null
+++ b/src/xml/escp2/model/model_42.xml
@@ -0,0 +1,156 @@
+<?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="42">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_43.xml b/src/xml/escp2/model/model_43.xml
new file mode 100644
index 0000000..a09c4be
--- /dev/null
+++ b/src/xml/escp2/model/model_43.xml
@@ -0,0 +1,164 @@
+<?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="43">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.710000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_44.xml b/src/xml/escp2/model/model_44.xml
new file mode 100644
index 0000000..94a230f
--- /dev/null
+++ b/src/xml/escp2/model/model_44.xml
@@ -0,0 +1,159 @@
+<?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="44">
+ <media src="escp2/media/c80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>60</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_45.xml b/src/xml/escp2/model/model_45.xml
new file mode 100644
index 0000000..fe2c304
--- /dev/null
+++ b/src/xml/escp2/model/model_45.xml
@@ -0,0 +1,125 @@
+<?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="45">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>16</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">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">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">-2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_46.xml b/src/xml/escp2/model/model_46.xml
new file mode 100644
index 0000000..5c04d80
--- /dev/null
+++ b/src/xml/escp2/model/model_46.xml
@@ -0,0 +1,142 @@
+<?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="46">
+ <media src="escp2/media/f360_photo.xml"/>
+ <inputSlots src="escp2/inputslots/cd_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_photo.xml"/>
+ <verticalBorderlessSequence>SN4\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006v\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004444\004\001\000\000\040\011</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>96</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>24</Nozzles>
+  <MinNozzles>24</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_47.xml b/src/xml/escp2/model/model_47.xml
new file mode 100644
index 0000000..6957236
--- /dev/null
+++ b/src/xml/escp2/model/model_47.xml
@@ -0,0 +1,151 @@
+<?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="47">
+ <media src="escp2/media/f360_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/cd_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_ultrachrome.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>HorizontalOnly</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <hasInterchangeableInkCartridges/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>96</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>192</Nozzles>
+  <MinNozzles>192</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Light Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.150000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.580000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.958000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.479000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_48.xml b/src/xml/escp2/model/model_48.xml
new file mode 100644
index 0000000..7ae84d7
--- /dev/null
+++ b/src/xml/escp2/model/model_48.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="48">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <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>Yes</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>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <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">1.150000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.580000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</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.479000</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_49.xml b/src/xml/escp2/model/model_49.xml
new file mode 100644
index 0000000..41ebb87
--- /dev/null
+++ b/src/xml/escp2/model/model_49.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="49">
+ <media src="escp2/media/pro_ultrachrome.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <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>Yes</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>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <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">1.150000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.580000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</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.479000</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_5.xml b/src/xml/escp2/model/model_5.xml
new file mode 100644
index 0000000..e49ebab
--- /dev/null
+++ b/src/xml/escp2/model/model_5.xml
@@ -0,0 +1,142 @@
+<?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="5">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</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>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_50.xml b/src/xml/escp2/model/model_50.xml
new file mode 100644
index 0000000..01e4e35
--- /dev/null
+++ b/src/xml/escp2/model/model_50.xml
@@ -0,0 +1,160 @@
+<?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="50">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.320000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_51.xml b/src/xml/escp2/model/model_51.xml
new file mode 100644
index 0000000..2c0c87e
--- /dev/null
+++ b/src/xml/escp2/model/model_51.xml
@@ -0,0 +1,160 @@
+<?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="51">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN,\000\000\001\027\000\000\000\000\000\000\001\003\000\243n\000\223x\2205\002\000\000\005\277\001\270\006d\000\024\036\032\004&quot;\005\310\031\000@\000\022c\362\006</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.320000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_52.xml b/src/xml/escp2/model/model_52.xml
new file mode 100644
index 0000000..30f3abe
--- /dev/null
+++ b/src/xml/escp2/model/model_52.xml
@@ -0,0 +1,166 @@
+<?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="52">
+ <media src="escp2/media/standard.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>144</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.320000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_53.xml b/src/xml/escp2/model/model_53.xml
new file mode 100644
index 0000000..c197e67
--- /dev/null
+++ b/src/xml/escp2/model/model_53.xml
@@ -0,0 +1,141 @@
+<?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="53">
+ <media src="escp2/media/f360_photo7_japan.xml"/>
+ <inputSlots src="escp2/inputslots/cd_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_photo7_japan.xml"/>
+ <verticalBorderlessSequence>SN4\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006v\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004444\004\001\000\000\040\011</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>96</Nozzles>
+  <MinNozzles>96</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>24</Nozzles>
+  <MinNozzles>24</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Dark Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_54.xml b/src/xml/escp2/model/model_54.xml
new file mode 100644
index 0000000..ccd116a
--- /dev/null
+++ b/src/xml/escp2/model/model_54.xml
@@ -0,0 +1,161 @@
+<?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="54">
+ <media src="escp2/media/photo_gen1.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen1.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>1999</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 3168</maximumMediaSize>
+ <maximumImageableArea>936 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180sw" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_55.xml b/src/xml/escp2/model/model_55.xml
new file mode 100644
index 0000000..d690c08
--- /dev/null
+++ b/src/xml/escp2/model/model_55.xml
@@ -0,0 +1,159 @@
+<?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="55">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_56.xml b/src/xml/escp2/model/model_56.xml
new file mode 100644
index 0000000..44e7936
--- /dev/null
+++ b/src/xml/escp2/model/model_56.xml
@@ -0,0 +1,163 @@
+<?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="56">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_57.xml b/src/xml/escp2/model/model_57.xml
new file mode 100644
index 0000000..da6ef78
--- /dev/null
+++ b/src/xml/escp2/model/model_57.xml
@@ -0,0 +1,143 @@
+<?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="57">
+ <media src="escp2/media/f360_photo7_japan.xml"/>
+ <inputSlots src="escp2/inputslots/cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/f360_photo7_japan.xml"/>
+ <verticalBorderlessSequence>SN8\000\000\007\033\000\000\000\000\000\000\001\003\000\330\006T\001\264\015,\013H\0070\011\316\022,\001\251\013,\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004C\000\000\001\001\001\364\006</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>360</Nozzles>
+  <MinNozzles>360</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>360</Nozzles>
+  <MinNozzles>360</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>720 360</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Dark Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.570000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.360000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</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_58.xml b/src/xml/escp2/model/model_58.xml
new file mode 100644
index 0000000..d5abbb4
--- /dev/null
+++ b/src/xml/escp2/model/model_58.xml
@@ -0,0 +1,129 @@
+<?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="58">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN8\000\000\007\027\000\000\000\000\000\000\001\003\000\330\006T\001\264\015&quot;\013H\0070\011\316\022,\001\251\013,\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004C\000\000\001\001\001\360\006</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>720 360</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.570000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.360000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">1440</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_59.xml b/src/xml/escp2/model/model_59.xml
new file mode 100644
index 0000000..a56aaf4
--- /dev/null
+++ b/src/xml/escp2/model/model_59.xml
@@ -0,0 +1,164 @@
+<?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="59">
+ <media src="escp2/media/x80.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/x80.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsInkChange/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>15</Nozzles>
+  <MinNozzles>15</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>48</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <initialVerticalOffset>-99</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 9 9</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.568000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.325000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.523000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.650000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_6.xml b/src/xml/escp2/model/model_6.xml
new file mode 100644
index 0000000..a83389f
--- /dev/null
+++ b/src/xml/escp2/model/model_6.xml
@@ -0,0 +1,142 @@
+<?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="6">
+ <media src="escp2/media/standard_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/standard_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/standard_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>64</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>180 180</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <pseudoSeparationRows>4</pseudoSeparationRows>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1224 3168</maximumMediaSize>
+ <maximumImageableArea>979 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">8 9 9 40</margins>
+ <margins interleave="printer" media="sheet">8 9 9 40</margins>
+ <margins interleave="soft" media="roll">8 9 0 0</margins>
+ <margins interleave="printer" media="roll">8 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_60.xml b/src/xml/escp2/model/model_60.xml
new file mode 100644
index 0000000..8e13707
--- /dev/null
+++ b/src/xml/escp2/model/model_60.xml
@@ -0,0 +1,163 @@
+<?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="60">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\0044\001\000\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_61.xml b/src/xml/escp2/model/model_61.xml
new file mode 100644
index 0000000..32c7f04
--- /dev/null
+++ b/src/xml/escp2/model/model_61.xml
@@ -0,0 +1,173 @@
+<?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="61">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\0044\001\016\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-180</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_62.xml b/src/xml/escp2/model/model_62.xml
new file mode 100644
index 0000000..4a6afe7
--- /dev/null
+++ b/src/xml/escp2/model/model_62.xml
@@ -0,0 +1,166 @@
+<?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="62">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN4\000\000\003\026\000\000\000\000\000\000\001\003\000\007d(\002j\215\0003\344\000\040P\000\207h\020\212\0038\002\360\001\324@\000\001\010\001baa`a\024\002\025\0271Z\011</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>399 394</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_63.xml b/src/xml/escp2/model/model_63.xml
new file mode 100644
index 0000000..3b57e61
--- /dev/null
+++ b/src/xml/escp2/model/model_63.xml
@@ -0,0 +1,156 @@
+<?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="63">
+ <media src="escp2/media/photo_gen3.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen3.xml"/>
+ <verticalBorderlessSequence>SNP\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001X\002\320\004G\001G\002\000\000\000\000P\010\204\020\030\025\310\031\340=\240\017\214\0120\005\214\000\012\001,\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\0010\010</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.657000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.684000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.604000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.566000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_64.xml b/src/xml/escp2/model/model_64.xml
new file mode 100644
index 0000000..3fe8624
--- /dev/null
+++ b/src/xml/escp2/model/model_64.xml
@@ -0,0 +1,174 @@
+<?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="64">
+ <media src="escp2/media/r800.xml"/>
+ <inputSlots src="escp2/inputslots/r1800.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykrb.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>SNT\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007T\001P\012\252\000\363\006?\002P\012\277\007(\002%\013,\001\253\000\037\001!\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033ccccccccccc\002\000\001\000\001\001\362\014</verticalBorderlessSequence>
+ <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>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.869000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_65.xml b/src/xml/escp2/model/model_65.xml
new file mode 100644
index 0000000..fd373be
--- /dev/null
+++ b/src/xml/escp2/model/model_65.xml
@@ -0,0 +1,152 @@
+<?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="65">
+ <media src="escp2/media/cx3650.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/cx3650.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.657000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.684000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.604000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.566000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.283000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_66.xml b/src/xml/escp2/model/model_66.xml
new file mode 100644
index 0000000..776d5b5
--- /dev/null
+++ b/src/xml/escp2/model/model_66.xml
@@ -0,0 +1,173 @@
+<?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="66">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\0044\001\016\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-180</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_67.xml b/src/xml/escp2/model/model_67.xml
new file mode 100644
index 0000000..0ee888b
--- /dev/null
+++ b/src/xml/escp2/model/model_67.xml
@@ -0,0 +1,175 @@
+<?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="67">
+ <media src="escp2/media/cmykrb.xml"/>
+ <inputSlots src="escp2/inputslots/r1800.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykrb.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>SNT\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007T\001P\012\252\000\363\006?\002P\012\277\007(\002%\013,\001\253\000\037\001!\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033ccccccccccc\002\000\001\000\001\001\362\014</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>96</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.869000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_68.xml b/src/xml/escp2/model/model_68.xml
new file mode 100644
index 0000000..0788063
--- /dev/null
+++ b/src/xml/escp2/model/model_68.xml
@@ -0,0 +1,174 @@
+<?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="68">
+ <media src="escp2/media/cmykrb.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykrb.xml"/>
+ <verticalBorderlessSequence>SNT\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007T\001P\012\252\000\363\006?\002P\012\277\007(\002%\013,\001\253\000\037\001!\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033ccccccccccc\002\000\001\000\001\001\362\014</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.869000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_69.xml b/src/xml/escp2/model/model_69.xml
new file mode 100644
index 0000000..1351e9d
--- /dev/null
+++ b/src/xml/escp2/model/model_69.xml
@@ -0,0 +1,171 @@
+<?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="69">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\0044\001\000\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_7.xml b/src/xml/escp2/model/model_7.xml
new file mode 100644
index 0000000..7e6b0fa
--- /dev/null
+++ b/src/xml/escp2/model/model_7.xml
@@ -0,0 +1,153 @@
+<?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="7">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_70.xml b/src/xml/escp2/model/model_70.xml
new file mode 100644
index 0000000..148a564
--- /dev/null
+++ b/src/xml/escp2/model/model_70.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="70">
+ <media src="escp2/media/photo_gen4.xml"/>
+ <inputSlots src="escp2/inputslots/rx700.xml"/>
+ <qualityPresets src="escp2/qualitypresets/p1_5.xml"/>
+ <inkGroup src="escp2/inks/photo_gen4.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 263</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.350000</parameter>
+   <parameter type="float" name="DropSize2">0.700000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.869000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_71.xml b/src/xml/escp2/model/model_71.xml
new file mode 100644
index 0000000..898d744
--- /dev/null
+++ b/src/xml/escp2/model/model_71.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2:model id="71">
+ <media src="escp2/media/f360_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/r2400.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/f360_ultrachrome_k3.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <hasInterchangeableInkCartridges/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Black"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.770000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.886000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.443000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.221000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.240000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.410000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.293000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.293000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.146000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_72.xml b/src/xml/escp2/model/model_72.xml
new file mode 100644
index 0000000..5587717
--- /dev/null
+++ b/src/xml/escp2/model/model_72.xml
@@ -0,0 +1,171 @@
+<?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="72">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-180</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_73.xml b/src/xml/escp2/model/model_73.xml
new file mode 100644
index 0000000..9daba8b
--- /dev/null
+++ b/src/xml/escp2/model/model_73.xml
@@ -0,0 +1,124 @@
+<?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="73">
+ <media src="escp2/media/picturemate_6.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/picturemate.xml"/>
+ <inkGroup src="escp2/inks/picturemate_6.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>1440 720</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>288 86400</maximumMediaSize>
+ <maximumImageableArea>288 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Blue"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="1440x720ov" text="1440 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <printedResolution>1440 720</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x1440ov" text="1440 x 720 DPI Transposed">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printedResolution>720 1440</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.798000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.615000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_74.xml b/src/xml/escp2/model/model_74.xml
new file mode 100644
index 0000000..55cbbfe
--- /dev/null
+++ b/src/xml/escp2/model/model_74.xml
@@ -0,0 +1,159 @@
+<?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="74">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.700000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.250000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_75.xml b/src/xml/escp2/model/model_75.xml
new file mode 100644
index 0000000..4565e95
--- /dev/null
+++ b/src/xml/escp2/model/model_75.xml
@@ -0,0 +1,148 @@
+<?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="75">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.325000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_76.xml b/src/xml/escp2/model/model_76.xml
new file mode 100644
index 0000000..cf18be9
--- /dev/null
+++ b/src/xml/escp2/model/model_76.xml
@@ -0,0 +1,150 @@
+<?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="76">
+ <media src="escp2/media/photo_gen4.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen4.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFast360DPI/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.500000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.325000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_77.xml b/src/xml/escp2/model/model_77.xml
new file mode 100644
index 0000000..1083c9f
--- /dev/null
+++ b/src/xml/escp2/model/model_77.xml
@@ -0,0 +1,155 @@
+<?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="77">
+ <media src="escp2/media/c64.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c64.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.657000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.684000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.604000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.566000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_78.xml b/src/xml/escp2/model/model_78.xml
new file mode 100644
index 0000000..90a5689
--- /dev/null
+++ b/src/xml/escp2/model/model_78.xml
@@ -0,0 +1,164 @@
+<?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="78">
+ <media src="escp2/media/photo_gen2.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen2.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>48</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>2880 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.375000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720hq2" text="2880 x 720 DPI Highest Quality">
+   <physicalResolution>2880 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_79.xml b/src/xml/escp2/model/model_79.xml
new file mode 100644
index 0000000..dc9782a
--- /dev/null
+++ b/src/xml/escp2/model/model_79.xml
@@ -0,0 +1,163 @@
+<?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="79">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SN2\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000?\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000?\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000]\006</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_8.xml b/src/xml/escp2/model/model_8.xml
new file mode 100644
index 0000000..5c6ac5b
--- /dev/null
+++ b/src/xml/escp2/model/model_8.xml
@@ -0,0 +1,152 @@
+<?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="8">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>1440 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>849 3168</maximumMediaSize>
+ <maximumImageableArea>849 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq2" text="1440 x 720 DPI Highest Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">4</parameter>
+   <parameter type="integer" name="escp2_base_res">360</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_80.xml b/src/xml/escp2/model/model_80.xml
new file mode 100644
index 0000000..7e0ab82
--- /dev/null
+++ b/src/xml/escp2/model/model_80.xml
@@ -0,0 +1,171 @@
+<?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="80">
+ <media src="escp2/media/c82.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c82.xml"/>
+ <verticalBorderlessSequence>SN2\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000?\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000?\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000]\006</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>180</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.000000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.200000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.280000</parameter>
+   <parameter type="float" name="DropSize2">0.000000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x720sw" text="2880 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_81.xml b/src/xml/escp2/model/model_81.xml
new file mode 100644
index 0000000..cbadcdd
--- /dev/null
+++ b/src/xml/escp2/model/model_81.xml
@@ -0,0 +1,187 @@
+<?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="81">
+ <media src="escp2/media/claria.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 90</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 189</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.760000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">36</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.586000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.338000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_82.xml b/src/xml/escp2/model/model_82.xml
new file mode 100644
index 0000000..7cee45e
--- /dev/null
+++ b/src/xml/escp2/model/model_82.xml
@@ -0,0 +1,207 @@
+<?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="82">
+ <media src="escp2/media/claria1400.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 90</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 263</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.420000</parameter>
+   <parameter type="float" name="DropSize2">0.670000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360un" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.760000</parameter>
+   <parameter type="integer" name="escp2_ink_type">33</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.420000</parameter>
+   <parameter type="float" name="DropSize2">0.670000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720un" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.880000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">51</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.125000</parameter>
+   <parameter type="float" name="DropSize2">0.420000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.586000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.338000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.733000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.833000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.440000</parameter>
+   <parameter type="integer" name="escp2_ink_type">37</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_83.xml b/src/xml/escp2/model/model_83.xml
new file mode 100644
index 0000000..3a8b6e5
--- /dev/null
+++ b/src/xml/escp2/model/model_83.xml
@@ -0,0 +1,162 @@
+<?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="83">
+ <media src="escp2/media/photo_gen3_4.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen3_4.xml"/>
+ <verticalBorderlessSequence>SNP\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001X\002\320\004G\001G\002\000\000\000\000P\010\204\020\030\025\310\031\340=\240\017\214\0120\005\214\000\012\001,\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\0010\010</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.657000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.684000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.604000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.566000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.283000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_84.xml b/src/xml/escp2/model/model_84.xml
new file mode 100644
index 0000000..50eaf90
--- /dev/null
+++ b/src/xml/escp2/model/model_84.xml
@@ -0,0 +1,156 @@
+<?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="84">
+ <media src="escp2/media/photo_gen3.xml"/>
+ <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen3.xml"/>
+ <verticalBorderlessSequence>SNL\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\0044\001\000\002\000\000\000\0004\010h\020\030\025\310\031\340=\314\020\214\012\024\005\214\000\012\001,\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x240sw" text="360 x 240 DPI Draft">
+   <physicalResolution>360 240</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.679000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.150000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.657000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.480000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.684000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.604000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.566000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_85.xml b/src/xml/escp2/model/model_85.xml
new file mode 100644
index 0000000..2cdc01c
--- /dev/null
+++ b/src/xml/escp2/model/model_85.xml
@@ -0,0 +1,215 @@
+<?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="85">
+ <media src="escp2/media/c120.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/c120.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>59</Nozzles>
+  <MinNozzles>60</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-240</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black 1"/>
+  <ChannelName translate="name" name="Black 2"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.120000</parameter>
+   <parameter type="float" name="DropSize2">0.300000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_86.xml b/src/xml/escp2/model/model_86.xml
new file mode 100644
index 0000000..9d04ab5
--- /dev/null
+++ b/src/xml/escp2/model/model_86.xml
@@ -0,0 +1,122 @@
+<?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="86">
+ <media src="escp2/media/picturemate_4.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/picturemate.xml"/>
+ <inkGroup src="escp2/inks/picturemate_4.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>1440 720</minimumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>288 86400</maximumMediaSize>
+ <maximumImageableArea>288 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="1440x720ov" text="1440 x 720 DPI">
+   <physicalResolution>2880 720</physicalResolution>
+   <printedResolution>1440 720</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x1440ov" text="1440 x 720 DPI Transposed">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printedResolution>720 1440</printedResolution>
+   <parameter type="float" name="escp2_density">1.596000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440sw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.798000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.400000</parameter>
+   <parameter type="float" name="DropSize2">0.650000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.650000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.615000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.530000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_87.xml b/src/xml/escp2/model/model_87.xml
new file mode 100644
index 0000000..ef7b36b
--- /dev/null
+++ b/src/xml/escp2/model/model_87.xml
@@ -0,0 +1,192 @@
+<?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="87">
+ <media src="escp2/media/b500.xml"/>
+ <inputSlots src="escp2/inputslots/b500.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/b500.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>No</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>358</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>360 360</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>360</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>-7</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>1036800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 27 27</margins>
+ <margins interleave="printer" media="sheet">9 9 27 27</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutionScale>14400</resolutionScale>
+ <resolutions>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.300000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.630000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.630000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.817000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.817000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.227000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.250000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">0.680000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720hq" text="1440 x 720 DPI High Quality">
+   <physicalResolution>1440 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.250000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">0.680000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.625000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.550000</parameter>
+   <parameter type="float" name="DropSize2">0.680000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.460000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.810000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.284000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.284000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.142000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_88.xml b/src/xml/escp2/model/model_88.xml
new file mode 100644
index 0000000..ec35f1b
--- /dev/null
+++ b/src/xml/escp2/model/model_88.xml
@@ -0,0 +1,141 @@
+<?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="88">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <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>Yes</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>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</minimumMediaSize>
+ <maximumMediaSize>4608 86400</maximumMediaSize>
+ <maximumImageableArea>4608 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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Black"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <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">1.150000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.580000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</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.479000</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_89.xml b/src/xml/escp2/model/model_89.xml
new file mode 100644
index 0000000..3365c9a
--- /dev/null
+++ b/src/xml/escp2/model/model_89.xml
@@ -0,0 +1,141 @@
+<?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="89">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <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>Yes</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>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Black"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <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">1.150000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.580000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</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.479000</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_9.xml b/src/xml/escp2/model/model_9.xml
new file mode 100644
index 0000000..7dccef2
--- /dev/null
+++ b/src/xml/escp2/model/model_9.xml
@@ -0,0 +1,145 @@
+<?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="9">
+ <media src="escp2/media/photo_gen0.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/photo_gen0.xml"/>
+ <commandSet>1998</commandSet>
+ <borderless>No</borderless>
+ <sendZeroAdvance/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>32</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <minimumResolution>90 90</minimumResolution>
+ <maximumResolution>720 720</maximumResolution>
+ <separationRows>1</separationRows>
+ <extra720DPISeparation>8</extra720DPISeparation>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>518400</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>684 3168</maximumMediaSize>
+ <maximumImageableArea>612 3168</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 30</margins>
+ <margins interleave="printer" media="sheet">9 9 0 30</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>1 7 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x90dpi" text="360 x 90 DPI Fast Economy">
+   <physicalResolution>360 90</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="180dpi" text="180 DPI Economy">
+   <physicalResolution>180 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.600000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360mw" text="360 DPI High Quality">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">3</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.300000</parameter>
+   <parameter type="integer" name="escp2_ink_type">2</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq2" text="720 DPI Highest Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>4</verticalPasses>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">1</parameter>
+   <parameter type="integer" name="escp2_base_res">720</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_90.xml b/src/xml/escp2/model/model_90.xml
new file mode 100644
index 0000000..3a173ad
--- /dev/null
+++ b/src/xml/escp2/model/model_90.xml
@@ -0,0 +1,141 @@
+<?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="90">
+ <media src="escp2/media/pro_ultrachrome_k3.xml"/>
+ <inputSlots src="escp2/inputslots/pro_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/standard.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <verticalBorderlessSequence>SN\003\000\000\011\001</verticalBorderlessSequence>
+ <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>Yes</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>7</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 1440</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>504 504</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>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="Light Magenta"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Black"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180dpi" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <printerWeave command="\033(i\001\000\000"/>
+   <parameter type="float" name="escp2_density">2.300000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <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">1.150000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.580000</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.160000</parameter>
+   <parameter type="float" name="DropSize2">0.400000</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">0.766000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720mw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</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.479000</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_91.xml b/src/xml/escp2/model/model_91.xml
new file mode 100644
index 0000000..7cd7a2e
--- /dev/null
+++ b/src/xml/escp2/model/model_91.xml
@@ -0,0 +1,182 @@
+<?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="91">
+ <media src="escp2/media/cmykro.xml"/>
+ <inputSlots src="escp2/inputslots/r1800.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/cmykro.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>28800</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>96</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 11</margins>
+ <margins interleave="printer" media="sheet">9 9 0 11</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>204 263</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Matte Black"/>
+  <ChannelName translate="name" name="Photo Black"/>
+  <ChannelName translate="name" name="Red"/>
+  <ChannelName translate="name" name="Orange"/>
+  <ChannelName translate="name" name="Gloss Optimizer"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">2.800000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.400000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.380000</parameter>
+   <parameter type="float" name="DropSize2">0.750000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.869000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.235000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.942000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.471000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.235000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.235000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.470000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.250000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.530000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_92.xml b/src/xml/escp2/model/model_92.xml
new file mode 100644
index 0000000..c9935a7
--- /dev/null
+++ b/src/xml/escp2/model/model_92.xml
@@ -0,0 +1,216 @@
+<?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="92">
+ <media src="escp2/media/c120.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/wf40.xml"/>
+ <inkGroup src="escp2/inks/wf40.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>128</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>384</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>384</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>0</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.220000</parameter>
+   <parameter type="float" name="DropSize2">0.320000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.768000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.384000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.384</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.384000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.384000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.192000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_93.xml b/src/xml/escp2/model/model_93.xml
new file mode 100644
index 0000000..49677b3
--- /dev/null
+++ b/src/xml/escp2/model/model_93.xml
@@ -0,0 +1,204 @@
+<?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="93">
+ <media src="escp2/media/wf500.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/wf40.xml"/>
+ <inkGroup src="escp2/inks/wf500.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>0</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_94.xml b/src/xml/escp2/model/model_94.xml
new file mode 100644
index 0000000..7ebaf17
--- /dev/null
+++ b/src/xml/escp2/model/model_94.xml
@@ -0,0 +1,216 @@
+<?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="94">
+ <media src="escp2/media/wf500.xml"/>
+ <inputSlots src="escp2/inputslots/default.xml"/>
+ <qualityPresets src="escp2/qualitypresets/wf40.xml"/>
+ <inkGroup src="escp2/inks/nx100.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Yes</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>29</Nozzles>
+  <MinNozzles>30</MinNozzles>
+  <FirstNozzle>1</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="black">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <headConfiguration type="fast">
+  <Nozzles>90</Nozzles>
+  <MinNozzles>90</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>3</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>4</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 120</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <initialVerticalOffset>0</initialVerticalOffset>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>612 86400</maximumMediaSize>
+ <maximumImageableArea>612 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <extraBottom>24</extraBottom>
+ <CDOffset>204 191</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+  <ChannelName translate="name" name="Black"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
+   <physicalResolution>360 120</physicalResolution>
+   <parameter type="float" name="escp2_density">4.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360hq" text="360 DPI Enhanced">
+   <physicalResolution>360 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">2.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360hq" text="720 x 360 DPI Enhanced">
+   <physicalResolution>720 360</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">1.560000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720hq" text="720 DPI High Quality">
+   <physicalResolution>720 720</physicalResolution>
+   <verticalPasses>2</verticalPasses>
+   <parameter type="float" name="escp2_density">0.780000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.200000</parameter>
+   <parameter type="float" name="DropSize2">0.330000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.250000</parameter>
+   <parameter type="float" name="DropSize2">0.500000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.512000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.500000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.512</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.256000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.128000</parameter>
+   <parameter type="integer" name="escp2_ink_type">19</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/Makefile.am b/src/xml/escp2/qualitypresets/Makefile.am
new file mode 100644
index 0000000..50ba65a
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/Makefile.am
@@ -0,0 +1,44 @@
+## $Id: Makefile.am,v 1.2 2008/10/19 13:57:27 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/qualitypresets
+
+pkgxmldata_DATA =				\
+	p1_5.xml				\
+	picturemate.xml				\
+	standard.xml				\
+	v2880.xml				\
+	wf40.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/qualitypresets/Makefile.in b/src/xml/escp2/qualitypresets/Makefile.in
new file mode 100644
index 0000000..88ed90f
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/Makefile.in
@@ -0,0 +1,498 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/qualitypresets
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/qualitypresets
+pkgxmldata_DATA = \
+	p1_5.xml				\
+	picturemate.xml				\
+	standard.xml				\
+	v2880.xml				\
+	wf40.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/qualitypresets/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/qualitypresets/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/qualitypresets/p1_5.xml b/src/xml/escp2/qualitypresets/p1_5.xml
new file mode 100644
index 0000000..a25073c
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/p1_5.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="p1_5">
+ <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>1440 720</minimumResolution>
+  <maximumResolution>1440 720</maximumResolution>
+  <desiredResolution>1440 720</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/qualitypresets/picturemate.xml b/src/xml/escp2/qualitypresets/picturemate.xml
new file mode 100644
index 0000000..b4b24f8
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/picturemate.xml
@@ -0,0 +1,60 @@
+<?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="picturemate">
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>1440 720</minimumResolution>
+  <maximumResolution>1440 720</maximumResolution>
+  <desiredResolution>1440 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>1440 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>1440 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>5760 1440</minimumResolution>
+  <maximumResolution>5760 1440</maximumResolution>
+  <desiredResolution>5760 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>5760 1440</minimumResolution>
+  <maximumResolution>5760 1440</maximumResolution>
+  <desiredResolution>5760 1440</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/standard.xml b/src/xml/escp2/qualitypresets/standard.xml
new file mode 100644
index 0000000..0878aad
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/standard.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>1440 720</minimumResolution>
+  <maximumResolution>2880 720</maximumResolution>
+  <desiredResolution>1440 720</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/qualitypresets/v2880.xml b/src/xml/escp2/qualitypresets/v2880.xml
new file mode 100644
index 0000000..82735ce
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/v2880.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="v2880">
+ <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>1440 720</minimumResolution>
+  <maximumResolution>2880 720</maximumResolution>
+  <desiredResolution>1440 720</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 2880</minimumResolution>
+  <maximumResolution>2880 2880</maximumResolution>
+  <desiredResolution>2880 2880</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>720 360</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>-1 -1</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/wf40.xml b/src/xml/escp2/qualitypresets/wf40.xml
new file mode 100644
index 0000000..2f135a4
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/wf40.xml
@@ -0,0 +1,65 @@
+<?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="Economy" text="Economy">
+  <minimumResolution>180 90</minimumResolution>
+  <maximumResolution>360 120</maximumResolution>
+  <desiredResolution>360 90</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>1440 720</minimumResolution>
+  <maximumResolution>2880 720</maximumResolution>
+  <desiredResolution>1440 720</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.am b/src/xml/escp2/weaves/Makefile.am
new file mode 100644
index 0000000..030f976
--- /dev/null
+++ b/src/xml/escp2/weaves/Makefile.am
@@ -0,0 +1,43 @@
+## $Id: Makefile.am,v 1.1 2008/06/20 00:11:29 rlk Exp $
+## Copyright (C) 2008 Robert Krawitz
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## Process this file with automake to produce Makefile.in.
+
+@SET_MAKE@
+
+include $(top_srcdir)/scripts/global.mk
+
+## Variables
+
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/weaves
+
+pkgxmldata_DATA =				\
+	pro7000.xml				\
+	pro7500.xml				\
+	pro7600.xml				\
+	standard.xml
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+
+EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/weaves/Makefile.in b/src/xml/escp2/weaves/Makefile.in
new file mode 100644
index 0000000..2f5a0c4
--- /dev/null
+++ b/src/xml/escp2/weaves/Makefile.in
@@ -0,0 +1,497 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Variables
+
+#export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
+subdir = src/xml/escp2/weaves
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkgxmldatadir)"
+pkgxmldataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgxmldata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPS_CFLAGS = @CUPS_CFLAGS@
+CUPS_CONFIG = @CUPS_CONFIG@
+CUPS_LIBS = @CUPS_LIBS@
+CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DB2HTML = @DB2HTML@
+DB2PDF = @DB2PDF@
+DB2PS = @DB2PS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIALOG = @DIALOG@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DVIPDF = @DVIPDF@
+DVIPS = @DVIPS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FIND = @FIND@
+FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
+FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
+FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
+GENPPD_LIBS = @GENPPD_LIBS@
+GIMP2_CFLAGS = @GIMP2_CFLAGS@
+GIMP2_LIBS = @GIMP2_LIBS@
+GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
+GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
+GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
+GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
+GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
+GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
+GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
+GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
+GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
+GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
+GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
+GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
+
+# Libraries
+GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
+GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
+GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
+GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
+GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
+IJS_CFLAGS = @IJS_CFLAGS@
+IJS_CONFIG = @IJS_CONFIG@
+IJS_LIBS = @IJS_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
+LIBS = $(INTLLIBS) @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LN_S = @LN_S@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PLUG_IN_PATH = @PLUG_IN_PATH@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+RELEASE_DATE = @RELEASE_DATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST = @TEST@
+TEXI2HTML = @TEXI2HTML@
+TRUE = @TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WHICH_PPDS = @WHICH_PPDS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cups_bindir = @cups_bindir@
+cups_conf_datadir = @cups_conf_datadir@
+cups_conf_serverbin = @cups_conf_serverbin@
+cups_conf_serverroot = @cups_conf_serverroot@
+cups_exec_prefix = @cups_exec_prefix@
+cups_prefix = @cups_prefix@
+cups_sbindir = @cups_sbindir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gimp2_plug_indir = @gimp2_plug_indir@
+gutenprint_cflags = @gutenprint_cflags@
+gutenprint_libdeps = @gutenprint_libdeps@
+gutenprint_libs = @gutenprint_libs@
+gutenprintui2_cflags = @gutenprintui2_cflags@
+gutenprintui2_libdeps = @gutenprintui2_libdeps@
+gutenprintui2_libs = @gutenprintui2_libs@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
+GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
+pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/weaves
+pkgxmldata_DATA = \
+	pro7000.xml				\
+	pro7500.xml				\
+	pro7600.xml				\
+	standard.xml
+
+CLEANFILES = xmli18n-tmp.h xml-stamp
+EXTRA_DIST = $(pkgxmldata_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/xml/escp2/weaves/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/xml/escp2/weaves/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgxmldataDATA: $(pkgxmldata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgxmldatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgxmldatadir)"
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(pkgxmldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  $(pkgxmldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+
+uninstall-pkgxmldataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgxmldata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgxmldatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgxmldatadir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+	for dir in "$(DESTDIR)$(pkgxmldatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgxmldataDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgxmldataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+	clean-libtool distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-pkgxmldataDATA
+
+
+@SET_MAKE@
+
+# Rules
+
+$(top_builddir)/src/main/libgutenprint.la:
+	cd $(top_builddir)/src/main; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui/libgutenprintui.la:
+	cd $(top_builddir)/src/gutenprintui; \
+	$(MAKE)
+
+$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
+	cd $(top_builddir)/src/gutenprintui2; \
+	$(MAKE)
+
+xml-stamp: $(pkgxmldata_DATA) Makefile.am
+	-rm -f xml-stamp
+	touch xml-stamp
+	for f in $(pkgxmldata_DATA) ; do echo $$f >> xml-stamp; done
+
+all-local: xml-stamp
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/xml/escp2/weaves/pro7000.xml b/src/xml/escp2/weaves/pro7000.xml
new file mode 100644
index 0000000..b700f82
--- /dev/null
+++ b/src/xml/escp2/weaves/pro7000.xml
@@ -0,0 +1,30 @@
+<?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:PrinterWeaves name="pro7000">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="Interleave" command="\033(i\001\000\001"/>
+ <weave translate="text" name="FOL" text="Full Overlap" command="\033(i\001\000\002"/>
+ <weave translate="text" name="FourPass" text="Four Pass" command="\033(i\001\000\003"/>
+ <weave translate="text" name="FOL2" text="Full Overlap 2" command="\033(i\001\000\004"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/pro7500.xml b/src/xml/escp2/weaves/pro7500.xml
new file mode 100644
index 0000000..9522415
--- /dev/null
+++ b/src/xml/escp2/weaves/pro7500.xml
@@ -0,0 +1,31 @@
+<?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:PrinterWeaves name="pro7500">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="Interleave" command="\033(i\001\000\001"/>
+ <weave translate="text" name="FOL" text="Full Overlap" command="\033(i\001\000\002"/>
+ <weave translate="text" name="FourPass" text="Four Pass" command="\033(i\001\000\003"/>
+ <weave translate="text" name="FOL2" text="Full Overlap 2" command="\033(i\001\000\004"/>
+ <weave translate="text" name="MW2" text="Interleave 2" command="\033(i\001\000\005"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/pro7600.xml b/src/xml/escp2/weaves/pro7600.xml
new file mode 100644
index 0000000..a0b98a3
--- /dev/null
+++ b/src/xml/escp2/weaves/pro7600.xml
@@ -0,0 +1,32 @@
+<?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:PrinterWeaves name="pro7600">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="Interleave" command="\033(i\001\000\001"/>
+ <weave translate="text" name="FOL" text="Full Overlap" command="\033(i\001\000\002"/>
+ <weave translate="text" name="FourPass" text="Four Pass" command="\033(i\001\000\003"/>
+ <weave translate="text" name="FOL2" text="Full Overlap 2" command="\033(i\001\000\004"/>
+ <weave translate="text" name="MW2" text="Interleave 2" command="\033(i\001\000\005"/>
+ <weave translate="text" name="EightPass" text="Eight Pass" command="\033(i\001\000\006"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/standard.xml b/src/xml/escp2/weaves/standard.xml
new file mode 100644
index 0000000..98112bf
--- /dev/null
+++ b/src/xml/escp2/weaves/standard.xml
@@ -0,0 +1,27 @@
+ <?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:PrinterWeaves name="standard">
+ <weave translate="text" name="Off" text="Off" command="\033(i\001\000\000"/>
+ <weave translate="text" name="On" text="On" command="\033(i\001\000\001"/>
+</escp2:PrinterWeaves>
+</gutenprint>
diff --git a/src/xml/extract-strings.c b/src/xml/extract-strings.c
new file mode 100644
index 0000000..e6cecec
--- /dev/null
+++ b/src/xml/extract-strings.c
@@ -0,0 +1,63 @@
+/*
+ * "$Id: extract-strings.c,v 1.2 2008/06/14 02:25:25 rlk Exp $"
+ *
+ * Extract translation strings
+ *
+ * Copyright 2008 by Robert Krawitz.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <gutenprint/gutenprint.h>
+#include <gutenprint/mxml.h>
+#include "config.h"
+
+int
+main(int argc, char **argv)
+{
+  int status = 0;
+  argv++;
+  while (*argv)
+    {
+      stp_mxml_node_t *top =
+	stp_mxmlLoadFromFile(NULL, *argv, STP_MXML_NO_CALLBACK);
+      if (top)
+	{
+	  stp_mxml_node_t *n = top;
+	  do
+	    {
+	      const char *attr = stp_mxmlElementGetAttr(n, "translate");
+	      if (attr)
+		{
+		  const char *str = stp_mxmlElementGetAttr(n, attr);
+		  char *s;
+		  stp_asprintf(&s, "N_(\"%s\");", str);
+		  printf("%-40s /* %s */\n", s, *argv);
+		  stp_free(s);
+		}
+	      n = stp_mxmlWalkNext(n, top, STP_MXML_DESCEND);
+	    } while (n);
+	  stp_mxmlDelete(top);
+	}
+      else
+	{
+	  fprintf(stderr, "Cannot read %s: %s\n", *argv, strerror(errno));
+	  status = 1;
+	}
+      argv++;
+    }
+  return status;
+}
diff --git a/src/main/papers.xml b/src/xml/papers.xml
index 6aff8fe..fcda4f8 100644
--- a/src/main/papers.xml
+++ b/src/xml/papers.xml
@@ -1,100 +1,135 @@
 <?xml version="1.0"?>
 
 <!--
+   "$Id: papers.xml,v 1.5 2008/07/28 12:25:23 rlk Exp $"
+
    XML description of papers known to libgutenprint.
-   It should be edited by hand.
+   You can add additional paper sizes here.
 
-   "$Id: papers.xml,v 1.28 2008/04/15 00:08:20 rlk Exp $"
--->
+   NOTE: Margins should ONLY be specified for papers where the margin
+   is a property of the paper itself, for example a tear-off border.
+   Do NOT specify margins here to work around issues such as margins
+   being cut off (not printed) by the driver or by the printer itself.
+   These should either be handled with the Shrink Page If Necessary to
+   Fit Borders option (in CUPS) or if that doesn't work, by filing a
+   bug.
+
+   Changing borders here will change borders for ALL printers, even
+   even printers without whatever limitation it is that induced you
+   to consider setting margins in this file.  It is not under ANY
+   circumstances (other than the paper itself having margins) the right
+   thing to do.
 
-<!--
    Sizes are converted to 1/72in, then rounded down so that we don't
    print off the edge of the paper.
 -->
 
 
-
-<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
   <paperdef>
 <!-- GROUP: Imperial -->
     <paper name="Letter">
-      <description value="Letter"/>
+      <description translate="value" value="Letter"/>
       <comment value="8.5in x 11in"/>
       <width value="612"/>
       <height value="792"/>
+<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+<!-- problems with page margins that were present in 5.0.0.  That -->
+<!-- workaround is no longer needed.  Please see the explanation at the -->
+<!-- top of this file. -->
       <unit value="english"/>
     </paper>
     <paper name="Legal">
-      <description value="Legal"/>
+      <description translate="value" value="Legal"/>
       <comment value="8.5in x 14in"/>
       <width value="612"/>
       <height value="1008"/>
+<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+<!-- problems with page margins that were present in 5.0.0.  That -->
+<!-- workaround is no longer needed.  Please see the explanation at the -->
+<!-- top of this file. -->
       <unit value="english"/>
     </paper>
     <paper name="Tabloid">
-      <description value="Tabloid"/>
+      <description translate="value" value="Tabloid"/>
       <comment value="11in x 17in"/>
       <width value="792"/>
       <height value="1224"/>
       <unit value="english"/>
     </paper>
     <paper name="Executive">
-      <description value="Executive"/>
+      <description translate="value" value="Executive"/>
       <comment value="7.25in x 10.5in"/>
       <width value="522"/>
       <height value="756"/>
       <unit value="english"/>
     </paper>
     <paper name="Postcard">
-      <description value="Postcard"/>
+      <description translate="value" value="Postcard"/>
       <comment value="100mm x 147mm"/>
       <width value="283"/>
       <height value="416"/>
       <unit value="english"/>
     </paper>
     <paper name="CD5Inch">
-      <description value="CD - 5 inch"/>
+      <description translate="value" value="CD - 5 inch"/>
       <comment value="CD, 116mm diameter"/>
       <width value="329"/>
       <height value="329"/>
       <unit value="english"/>
     </paper>
     <paper name="CD3Inch">
-      <description value="CD - 3 inch"/>
+      <description translate="value" value="CD - 3 inch"/>
       <comment value="CD, 65mm diameter"/>
       <width value="184"/>
       <height value="184"/>
       <unit value="english"/>
     </paper>
     <paper name="CDCustom">
-      <description value="CD - Custom"/>
+      <description translate="value" value="CD - Custom"/>
       <comment value="CD, custom diameter"/>
       <width value="340"/>
       <height value="340"/>
       <unit value="english"/>
     </paper>
     <paper name="w216h360">
-      <description value="3x5"/>
+      <description translate="value" value="3x5"/>
       <width value="216"/>
       <height value="360"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w252h360">
-      <description value="3 1/2 x5"/>
+      <description translate="value" value="3 1/2 x5"/>
       <width value="252"/>
       <height value="360"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w288h432">
-      <description value="4x6"/>
+      <description translate="value" value="4x6"/>
       <width value="288"/>
       <height value="432"/>
       <unit value="english"/>
     </paper>
     <paper name="w324h495">
-      <description value="Epson 4x6 Photo Paper (tear-off borders)"/>
+      <description translate="value" value="Epson 4x6 Photo Paper (tear-off borders)"/>
       <width value="324"/>
       <height value="495"/>
       <unit value="english-extended"/>
@@ -104,51 +139,51 @@
       <bottom value="45"/>
     </paper>
     <paper name="w360h504">
-      <description value="5x7"/>
+      <description translate="value" value="5x7"/>
       <width value="360"/>
       <height value="504"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w360h576">
-      <description value="5x8"/>
+      <description translate="value" value="5x8"/>
       <width value="360"/>
       <height value="576"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w432h576">
-      <description value="6x8"/>
+      <description translate="value" value="6x8"/>
       <width value="432"/>
       <height value="576"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="c8x10">
-      <description value="8x10"/>
+      <description translate="value" value="8x10"/>
       <width value="576"/>
       <height value="720"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="Statement">
-      <description value="Manual"/>
+      <description translate="value" value="Manual"/>
       <comment value="5.5in x 8.5in (Statement)"/>
       <width value="396"/>
       <height value="612"/>
       <unit value="english"/>
     </paper>
     <paper name="TabloidExtra">
-      <description value="12x18"/>
+      <description translate="value" value="12x18"/>
       <comment value="Tabloid Extra"/>
       <width value="864"/>
       <height value="1296"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="SuperB">
-      <description value="Super B 13x19"/>
+      <description translate="value" value="Super B 13x19"/>
       <width value="936"/>
       <height value="1368"/>
       <unit value="english"/>
     </paper>
     <paper name="EngineeringC">
-      <description value="Engineering C 17x22"/>
+      <description translate="value" value="Engineering C 17x22"/>
       <width value="1224"/>
       <height value="1584"/>
       <unit value="english"/>
@@ -157,66 +192,66 @@
     Other common photographic paper sizes
 -->
     <paper name="w576h864">
-      <description value="8x12"/>
+      <description translate="value" value="8x12"/>
       <comment value="Sometimes used for 35mm"/>
       <width value="576"/>
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w792h1008">
-      <description value="11x14"/>
+      <description translate="value" value="11x14"/>
       <width value="792"/>
       <height value="1008"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1152h1440">
-      <description value="16x20"/>
+      <description translate="value" value="16x20"/>
       <width value="1152"/>
       <height value="1440"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1152h1728">
-      <description value="16x24"/>
+      <description translate="value" value="16x24"/>
       <comment value="20 x 24 for 35mm"/>
       <width value="1152"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1440h1728">
-      <description value="20x24"/>
+      <description translate="value" value="20x24"/>
       <width value="1440"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1440h2160">
-      <description value="20x30"/>
+      <description translate="value" value="20x30"/>
       <comment value="24 x 30 for 35mm"/>
       <width value="1440"/>
       <height value="2160"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1584h2160">
-      <description value="22x30"/>
+      <description translate="value" value="22x30"/>
       <comment value="Common watercolor paper"/>
       <width value="1584"/>
       <height value="2160"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1728h2160">
-      <description value="24x30"/>
+      <description translate="value" value="24x30"/>
       <width value="1728"/>
       <height value="2160"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1728h2592">
-      <description value="Super A1 24x36"/>
+      <description translate="value" value="Super A1 24x36"/>
       <comment value="Sometimes used for 35mm"/>
       <width value="1728"/>
       <height value="2592"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w2160h2880">
-      <description value="30x40"/>
+      <description translate="value" value="30x40"/>
       <width value="2160"/>
       <height value="2880"/>
       <unit value="english-extended"/>
@@ -233,98 +268,102 @@
     size is obtained by doubling or halving another A size.
 -->
     <paper name="w4768h6749">
-      <description value="4A"/>
+      <description translate="value" value="4A"/>
       <comment value="1682mm x 2378mm"/>
       <width value="4768"/>
       <height value="6749"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w3370h4768">
-      <description value="2A"/>
+      <description translate="value" value="2A"/>
       <comment value="1189mm x 1682mm"/>
       <width value="3370"/>
       <height value="4768"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="SuperA0">
-      <description value="Super A0"/>
+      <description translate="value" value="Super A0"/>
       <comment value="914mm x 1292mm"/>
       <width value="2590"/>
       <height value="3662"/>
       <unit value="metric"/>
     </paper>
     <paper name="A0">
-      <description value="A0"/>
+      <description translate="value" value="A0"/>
       <comment value="841mm x 1189mm"/>
       <width value="2384"/>
       <height value="3370"/>
       <unit value="metric"/>
     </paper>
     <paper name="A1">
-      <description value="A1"/>
+      <description translate="value" value="A1"/>
       <comment value="594mm x 841mm"/>
       <width value="1684"/>
       <height value="2384"/>
       <unit value="metric"/>
     </paper>
     <paper name="A2">
-      <description value="A2"/>
+      <description translate="value" value="A2"/>
       <comment value="420mm x 594mm"/>
       <width value="1191"/>
       <height value="1684"/>
       <unit value="metric"/>
     </paper>
     <paper name="A3">
-      <description value="A3"/>
+      <description translate="value" value="A3"/>
       <comment value="297mm x 420mm"/>
       <width value="842"/>
       <height value="1191"/>
       <unit value="metric"/>
     </paper>
     <paper name="A4">
-      <description value="A4"/>
+      <description translate="value" value="A4"/>
       <comment value="210mm x 297mm"/>
       <width value="595"/>
       <height value="842"/>
       <unit value="metric"/>
+<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+<!-- problems with page margins that were present in 5.0.0.  That -->
+<!-- workaround is no longer needed.  Please see the explanation at the -->
+<!-- top of this file. -->
     </paper>
     <paper name="A5">
-      <description value="A5"/>
+      <description translate="value" value="A5"/>
       <comment value="148mm x 210mm"/>
       <width value="420"/>
       <height value="595"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A6">
-      <description value="A6"/>
+      <description translate="value" value="A6"/>
       <comment value="105mm x  148mm"/>
       <width value="297"/>
       <height value="420"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A7">
-      <description value="A7"/>
+      <description translate="value" value="A7"/>
       <comment value="74mm x 105mm"/>
       <width value="210"/>
       <height value="297"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A8">
-      <description value="A8"/>
+      <description translate="value" value="A8"/>
       <comment value="52mm x 74mm"/>
       <width value="148"/>
       <height value="210"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A9">
-      <description value="A9"/>
+      <description translate="value" value="A9"/>
       <comment value="37mm x 52mm"/>
       <width value="105"/>
       <height value="148"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="A10">
-      <description value="A10"/>
+      <description translate="value" value="A10"/>
       <comment value="26mm x 37mm"/>
       <width value="73"/>
       <height value="105"/>
@@ -335,35 +374,35 @@
      Allowance for trim is 3 millimetres.
 -->
     <paper name="w2437h3458">
-      <description value="RA0"/>
+      <description translate="value" value="RA0"/>
       <comment value="860mm x 1220mm"/>
       <width value="2437"/>
       <height value="3458"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1729h2437">
-      <description value="RA1"/>
+      <description translate="value" value="RA1"/>
       <comment value="610mm x 860mm"/>
       <width value="1729"/>
       <height value="2437"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1218h1729">
-      <description value="RA2"/>
+      <description translate="value" value="RA2"/>
       <comment value="430mm x 610mm"/>
       <width value="1218"/>
       <height value="1729"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w864h1218">
-      <description value="RA3"/>
+      <description translate="value" value="RA3"/>
       <comment value="305mm x 430mm"/>
       <width value="864"/>
       <height value="1218"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w609h864">
-      <description value="RA4"/>
+      <description translate="value" value="RA4"/>
       <comment value="215mm x 305mm"/>
       <width value="609"/>
       <height value="864"/>
@@ -373,35 +412,35 @@
     Stock sizes for bled work or extra trims.
 -->
     <paper name="w2551h3628">
-      <description value="SRA0"/>
+      <description translate="value" value="SRA0"/>
       <comment value="900mm x 1280mm"/>
       <width value="2551"/>
       <height value="3628"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1814h2551">
-      <description value="SRA1"/>
+      <description translate="value" value="SRA1"/>
       <comment value="640mm x 900mm"/>
       <width value="1814"/>
       <height value="2551"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w1275h1814">
-      <description value="SRA2"/>
+      <description translate="value" value="SRA2"/>
       <comment value="450mm x 640mm"/>
       <width value="1275"/>
       <height value="1814"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w907h1275">
-      <description value="SRA3"/>
+      <description translate="value" value="SRA3"/>
       <comment value="320mm x 450mm"/>
       <width value="907"/>
       <height value="1275"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w637h907">
-      <description value="SRA4"/>
+      <description translate="value" value="SRA4"/>
       <comment value="225mm x 320mm"/>
       <width value="637"/>
       <height value="907"/>
@@ -412,91 +451,91 @@
     "B" series: Posters, wall charts and similar items.
 -->
     <paper name="w5669h8016">
-      <description value="4B ISO"/>
+      <description translate="value" value="4B ISO"/>
       <comment value="2000mm x 2828mm"/>
       <width value="5669"/>
       <height value="8016"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w4008h5669">
-      <description value="2B ISO"/>
+      <description translate="value" value="2B ISO"/>
       <comment value="1414mm x 2000mm"/>
       <width value="4008"/>
       <height value="5669"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB0">
-      <description value="B0 ISO"/>
+      <description translate="value" value="B0 ISO"/>
       <comment value="1000mm x 1414mm"/>
       <width value="2834"/>
       <height value="4008"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB1">
-      <description value="B1 ISO"/>
+      <description translate="value" value="B1 ISO"/>
       <comment value="707mm x 1000mm"/>
       <width value="2004"/>
       <height value="2834"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB2">
-      <description value="B2 ISO"/>
+      <description translate="value" value="B2 ISO"/>
       <comment value="500mm x 707mm"/>
       <width value="1417"/>
       <height value="2004"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB3">
-      <description value="B3 ISO"/>
+      <description translate="value" value="B3 ISO"/>
       <comment value="353mm x 500mm"/>
       <width value="1000"/>
       <height value="1417"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB4">
-      <description value="B4 ISO"/>
+      <description translate="value" value="B4 ISO"/>
       <comment value="250mm x 353mm"/>
       <width value="708"/>
       <height value="1000"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB5">
-      <description value="B5 ISO"/>
+      <description translate="value" value="B5 ISO"/>
       <comment value="176mm x 250mm"/>
       <width value="498"/>
       <height value="708"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB6">
-      <description value="B6 ISO"/>
+      <description translate="value" value="B6 ISO"/>
       <comment value="125mm x 176mm"/>
       <width value="354"/>
       <height value="498"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB7">
-      <description value="B7 ISO"/>
+      <description translate="value" value="B7 ISO"/>
       <comment value="88mm x 125mm"/>
       <width value="249"/>
       <height value="354"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB8">
-      <description value="B8 ISO"/>
+      <description translate="value" value="B8 ISO"/>
       <comment value="62mm x 88mm"/>
       <width value="175"/>
       <height value="249"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB9">
-      <description value="B9 ISO"/>
+      <description translate="value" value="B9 ISO"/>
       <comment value="44mm x 62mm"/>
       <width value="124"/>
       <height value="175"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="ISOB10">
-      <description value="B10 ISO"/>
+      <description translate="value" value="B10 ISO"/>
       <comment value="31mm x 44mm"/>
       <width value="87"/>
       <height value="124"/>
@@ -506,73 +545,73 @@
     JIS
 -->
     <paper name="SuperB0">
-      <description value="Super B0 JIS"/>
+      <description translate="value" value="Super B0 JIS"/>
       <width value="3167"/> <!-- Should be 3169, but Epson driver doesn't like that -->
       <height value="4478"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B0">
-      <description value="B0 JIS"/>
+      <description translate="value" value="B0 JIS"/>
       <width value="2919"/>
       <height value="4127"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B1">
-      <description value="B1 JIS"/>
+      <description translate="value" value="B1 JIS"/>
       <width value="2063"/>
       <height value="2919"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B2">
-      <description value="B2 JIS"/>
+      <description translate="value" value="B2 JIS"/>
       <width value="1459"/>
       <height value="2063"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B3">
-      <description value="B3 JIS"/>
+      <description translate="value" value="B3 JIS"/>
       <width value="1029"/>
       <height value="1459"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B4">
-      <description value="B4 JIS"/>
+      <description translate="value" value="B4 JIS"/>
       <width value="727"/>
       <height value="1029"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B5">
-      <description value="B5 JIS"/>
+      <description translate="value" value="B5 JIS"/>
       <width value="518"/>
       <height value="727"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B6">
-      <description value="B6 JIS"/>
+      <description translate="value" value="B6 JIS"/>
       <width value="362"/>
       <height value="518"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B7">
-      <description value="B7 JIS"/>
+      <description translate="value" value="B7 JIS"/>
       <width value="257"/>
       <height value="362"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B8">
-      <description value="B8 JIS"/>
+      <description translate="value" value="B8 JIS"/>
       <width value="180"/>
       <height value="257"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B9">
-      <description value="B9 JIS"/>
+      <description translate="value" value="B9 JIS"/>
       <width value="127"/>
       <height value="180"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="B10">
-      <description value="B10 JIS"/>
+      <description translate="value" value="B10 JIS"/>
       <width value="90"/>
       <height value="127"/>
       <unit value="metric-extended"/>
@@ -582,7 +621,7 @@
     "C" series: Envelopes or folders suitable for A size stationery.
 -->
     <paper name="C0">
-      <description value="C0"/>
+      <description translate="value" value="C0"/>
       <comment value="917mm x 1297mm"/>
       <width value="2599"/>
       <height value="3676"/>
@@ -590,7 +629,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C0_l">
-      <description value="C0 landscape"/>
+      <description translate="value" value="C0 landscape"/>
       <comment value="917mm x 1297mm landscape"/>
       <width value="3676"/>
       <height value="2599"/>
@@ -598,7 +637,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C1">
-      <description value="C1"/>
+      <description translate="value" value="C1"/>
       <comment value="648mm x 917mm"/>
       <width value="1836"/>
       <height value="2599"/>
@@ -606,7 +645,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C1_l">
-      <description value="C1 landscape"/>
+      <description translate="value" value="C1 landscape"/>
       <comment value="648mm x 917mm landscape"/>
       <width value="2599"/>
       <height value="1836"/>
@@ -614,7 +653,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C2">
-      <description value="C2"/>
+      <description translate="value" value="C2"/>
       <comment value="458mm x 648mm"/>
       <width value="1298"/>
       <height value="1836"/>
@@ -622,7 +661,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C2_l">
-      <description value="C2 landscape"/>
+      <description translate="value" value="C2 landscape"/>
       <comment value="458mm x 648mm landscape"/>
       <width value="1836"/>
       <height value="1298"/>
@@ -630,7 +669,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C3">
-      <description value="C3"/>
+      <description translate="value" value="C3"/>
       <comment value="324mm x 458mm"/>
       <width value="918"/>
       <height value="1298"/>
@@ -638,7 +677,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C3_l">
-      <description value="C3 landscape"/>
+      <description translate="value" value="C3 landscape"/>
       <comment value="324mm x 458mm landscape"/>
       <width value="1298"/>
       <height value="918"/>
@@ -646,7 +685,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C4">
-      <description value="C4"/>
+      <description translate="value" value="C4"/>
       <comment value="229mm x 324mm"/>
       <width value="649"/>
       <height value="918"/>
@@ -654,7 +693,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C4_l">
-      <description value="C4 landscape"/>
+      <description translate="value" value="C4 landscape"/>
       <comment value="229mm x 324mm landscape"/>
       <width value="918"/>
       <height value="649"/>
@@ -662,7 +701,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C5">
-      <description value="C5"/>
+      <description translate="value" value="C5"/>
       <comment value="162mm x 229mm"/>
       <width value="459"/>
       <height value="649"/>
@@ -670,7 +709,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C5_l">
-      <description value="C5 landscape"/>
+      <description translate="value" value="C5 landscape"/>
       <comment value="162mm x 229mm landscape"/>
       <width value="649"/>
       <height value="459"/>
@@ -678,7 +717,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w354h918">
-      <description value="B6-C4"/>
+      <description translate="value" value="B6-C4"/>
       <comment value="125mm x 324mm"/>
       <width value="354"/>
       <height value="918"/>
@@ -686,7 +725,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w354h918_l">
-      <description value="B6-C4 landscape"/>
+      <description translate="value" value="B6-C4 landscape"/>
       <comment value="125mm x 324mm landscape"/>
       <width value="918"/>
       <height value="354"/>
@@ -694,7 +733,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C6">
-      <description value="C6"/>
+      <description translate="value" value="C6"/>
       <comment value="114mm x 162mm"/>
       <width value="323"/>
       <height value="459"/>
@@ -702,7 +741,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C6_l">
-      <description value="C6 landscape"/>
+      <description translate="value" value="C6 landscape"/>
       <comment value="114mm x 162mm landscape"/>
       <width value="459"/>
       <height value="323"/>
@@ -710,7 +749,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="DL">
-      <description value="DL"/>
+      <description translate="value" value="DL"/>
       <comment value="110mm x 220mm"/>
       <width value="311"/>
       <height value="623"/>
@@ -718,7 +757,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="DL_l">
-      <description value="DL landscape"/>
+      <description translate="value" value="DL landscape"/>
       <comment value="110mm x 220mm landscape"/>
       <width value="623"/>
       <height value="311"/>
@@ -726,7 +765,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w229h459">
-      <description value="C7-6"/>
+      <description translate="value" value="C7-6"/>
       <comment value="81mm x 162mm"/>
       <width value="229"/>
       <height value="459"/>
@@ -734,7 +773,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="w229h459_l">
-      <description value="C7-6 landscape"/>
+      <description translate="value" value="C7-6 landscape"/>
       <comment value="81mm x 162mm landscape"/>
       <width value="459"/>
       <height value="229"/>
@@ -742,7 +781,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C7">
-      <description value="C7"/>
+      <description translate="value" value="C7"/>
       <comment value="81mm x 114mm"/>
       <width value="229"/>
       <height value="323"/>
@@ -750,7 +789,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C7_l">
-      <description value="C7 landscape"/>
+      <description translate="value" value="C7 landscape"/>
       <comment value="81mm x 114mm landscape"/>
       <width value="323"/>
       <height value="229"/>
@@ -758,7 +797,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C8">
-      <description value="C8"/>
+      <description translate="value" value="C8"/>
       <comment value="57mm x 81mm"/>
       <width value="161"/>
       <height value="229"/>
@@ -766,7 +805,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C8_l">
-      <description value="C8 landscape"/>
+      <description translate="value" value="C8 landscape"/>
       <comment value="57mm x 81mm landscape"/>
       <width value="229"/>
       <height value="161"/>
@@ -774,7 +813,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C9">
-      <description value="C9"/>
+      <description translate="value" value="C9"/>
       <comment value="40mm x 57mm"/>
       <width value="113"/>
       <height value="161"/>
@@ -782,7 +821,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C9_l">
-      <description value="C9 landscape"/>
+      <description translate="value" value="C9 landscape"/>
       <comment value="40mm x 57mm landscape"/>
       <width value="161"/>
       <height value="113"/>
@@ -790,7 +829,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C10">
-      <description value="C10"/>
+      <description translate="value" value="C10"/>
       <comment value="28mm x 40mm"/>
       <width value="79"/>
       <height value="113"/>
@@ -798,7 +837,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="C10_l">
-      <description value="C10 landscape"/>
+      <description translate="value" value="C10 landscape"/>
       <comment value="28mm x 40mm landscape"/>
       <width value="113"/>
       <height value="79"/>
@@ -810,70 +849,70 @@
     US CAD standard paper sizes
 -->
     <paper name="ARCHA">
-      <description value="ArchA"/>
+      <description translate="value" value="ArchA"/>
       <comment value="9in x 12in"/>
       <width value="648"/>
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHA_trans">
-      <description value="ArchA transposed"/>
+      <description translate="value" value="ArchA transposed"/>
       <comment value="12in x 9in"/>
       <width value="864"/>
       <height value="648"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHB">
-      <description value="ArchB"/>
+      <description translate="value" value="ArchB"/>
       <comment value="12in x 18in"/>
       <width value="864"/>
       <height value="1296"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHB_trans">
-      <description value="ArchB transposed"/>
+      <description translate="value" value="ArchB transposed"/>
       <comment value="18in x 12in"/>
       <width value="1296"/>
       <height value="864"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHC">
-      <description value="ArchC"/>
+      <description translate="value" value="ArchC"/>
       <comment value="18in x 24in"/>
       <width value="1296"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHC_trans">
-      <description value="ArchC transposed"/>
+      <description translate="value" value="ArchC transposed"/>
       <comment value="24in x 18in"/>
       <width value="1728"/>
       <height value="1296"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHD">
-      <description value="ArchD"/>
+      <description translate="value" value="ArchD"/>
       <comment value="24in x 36in"/>
       <width value="1728"/>
       <height value="2592"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHD_trans">
-      <description value="ArchD transposed"/>
+      <description translate="value" value="ArchD transposed"/>
       <comment value="36in x 24in"/>
       <width value="2592"/>
       <height value="1728"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHE">
-      <description value="ArchE"/>
+      <description translate="value" value="ArchE"/>
       <comment value="36in x 48in"/>
       <width value="2592"/>
       <height value="3456"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="ARCHE_trans">
-      <description value="ArchE transposed"/>
+      <description translate="value" value="ArchE transposed"/>
       <comment value="48in x 36in"/>
       <width value="3456"/>
       <height value="2592"/>
@@ -881,13 +920,13 @@
     </paper>
 <!-- GROUP: Foolscap -->
     <paper name="w612h936">
-      <description value="American foolscap"/>
+      <description translate="value" value="American foolscap"/>
       <width value="612"/>
       <height value="936"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w648h936">
-      <description value="European foolscap"/>
+      <description translate="value" value="European foolscap"/>
       <width value="648"/>
       <height value="936"/>
       <unit value="english-extended"/>
@@ -899,28 +938,28 @@
     standard metric sizes for case-bound titles as follows:
 -->
     <paper name="w535h697">
-      <description value="Crown Quarto"/>
+      <description translate="value" value="Crown Quarto"/>
       <comment value="189mm x 246mm"/>
       <width value="535"/>
       <height value="697"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w569h731">
-      <description value="Large Crown Quarto"/>
+      <description translate="value" value="Large Crown Quarto"/>
       <comment value="201mm x 258mm"/>
       <width value="569"/>
       <height value="731"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w620h782">
-      <description value="Demy Quarto"/>
+      <description translate="value" value="Demy Quarto"/>
       <comment value="219mm x 276mm"/>
       <width value="620"/>
       <height value="782"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w671h884">
-      <description value="Royal Quarto"/>
+      <description translate="value" value="Royal Quarto"/>
       <comment value="237mm x 312mm"/>
       <width value="671"/>
       <height value="884"/>
@@ -928,7 +967,7 @@
     </paper>
 <!--
     <paper name="ISO A4">
-      <description value="ISO A4"/>
+      <description translate="value" value="ISO A4"/>
       <comment value="210mm x 297mm"/>
       <width value="595"/>
       <height value="841"/>
@@ -936,28 +975,28 @@
     </paper>
 -->
     <paper name="w348h527">
-      <description value="Crown Octavo"/>
+      <description translate="value" value="Crown Octavo"/>
       <comment value="123mm x 186mm"/>
       <width value="348"/>
       <height value="527"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w365h561">
-      <description value="Large Crown Octavo"/>
+      <description translate="value" value="Large Crown Octavo"/>
       <comment value="129mm x 198mm"/>
       <width value="365"/>
       <height value="561"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w391h612">
-      <description value="Demy Octavo"/>
+      <description translate="value" value="Demy Octavo"/>
       <comment value="138mm x 216mm"/>
       <width value="391"/>
       <height value="612"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w442h663">
-      <description value="Royal Octavo"/>
+      <description translate="value" value="Royal Octavo"/>
       <comment value="156mm x 234mm"/>
       <width value="442"/>
       <height value="663"/>
@@ -965,7 +1004,7 @@
     </paper>
 <!--
     <paper name="ISO A5">
-      <description value="ISO A5"/>
+      <description translate="value" value="ISO A5"/>
       <comment value="148mm x 210mm"/>
       <width value="419"/>
       <height value="595"/>
@@ -976,21 +1015,21 @@
     Paperback sizes in common usage
 -->
     <paper name="w314h504">
-      <description value="Small paperback"/>
+      <description translate="value" value="Small paperback"/>
       <comment value="111mm x 178mm"/>
       <width value="314"/>
       <height value="504"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w314h513">
-      <description value="Penguin small paperback"/>
+      <description translate="value" value="Penguin small paperback"/>
       <comment value="111mm x 181mm"/>
       <width value="314"/>
       <height value="513"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="cw365h561">
-      <description value="Penguin large paperback"/>
+      <description translate="value" value="Penguin large paperback"/>
       <comment value="129mm x 198mm"/>
       <width value="365"/>
       <height value="561"/>
@@ -1001,70 +1040,70 @@
     Miscellaneous sizes
 -->
     <paper name="w283h425">
-      <description value="10cm x 15cm"/>
+      <description translate="value" value="10cm x 15cm"/>
       <comment value="100 x 150mm"/>
       <width value="283"/>
       <height value="425"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w283h420">
-      <description value="Hagaki Card"/>
+      <description translate="value" value="Hagaki Card"/>
       <comment value="100mm x 148mm"/>
       <width value="283"/>
       <height value="420"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w420h567">
-      <description value="Oufuku Card"/>
+      <description translate="value" value="Oufuku Card"/>
       <comment value="148mm x 200mm"/>
       <width value="420"/>
       <height value="567"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w340h666">
-      <description value="Japanese long envelope #3"/>
+      <description translate="value" value="Japanese long envelope #3"/>
       <width value="340"/>
       <height value="666"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w340h666_l">
-      <description value="Japanese long envelope #3 landscape"/>
+      <description translate="value" value="Japanese long envelope #3 landscape"/>
       <width value="666"/>
       <height value="340"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w255h581">
-      <description value="Japanese long envelope #4"/>
+      <description translate="value" value="Japanese long envelope #4"/>
       <width value="255"/>
       <height value="581"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w255h581_l">
-      <description value="Japanese long envelope #4 landscape"/>
+      <description translate="value" value="Japanese long envelope #4 landscape"/>
       <width value="581"/>
       <height value="255"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w680h941">
-      <description value="Japanese Kaku envelope #4"/>
+      <description translate="value" value="Japanese Kaku envelope #4"/>
       <width value="680"/>
       <height value="941"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="w680h941_l">
-      <description value="Japanese Kaku envelope #4 landscape"/>
+      <description translate="value" value="Japanese Kaku envelope #4 landscape"/>
       <width value="941"/>
       <height value="680"/>
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
     <paper name="COM10">
-      <description value="Commercial 10"/>
+      <description translate="value" value="Commercial 10"/>
       <comment value="US Commercial 10 env"/>
       <width value="297"/>
       <height value="684"/>
@@ -1072,7 +1111,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="COM10_l">
-      <description value="Commercial 10 landscape"/>
+      <description translate="value" value="Commercial 10 landscape"/>
       <comment value="US Commercial 10 env landscape"/>
       <width value="684"/>
       <height value="297"/>
@@ -1080,14 +1119,14 @@
       <type value="envelope"/>
     </paper>
     <paper name="w315h414">
-      <description value="A2 Invitation"/>
+      <description translate="value" value="A2 Invitation"/>
       <comment value="US A2 invitation"/>
       <width value="315"/>
       <height value="414"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="Monarch">
-      <description value="Monarch Envelope"/>
+      <description translate="value" value="Monarch Envelope"/>
       <comment value="3.875in x 7.5in"/>
       <width value="279"/>
       <height value="540"/>
@@ -1095,7 +1134,7 @@
       <type value="envelope"/>
     </paper>
     <paper name="Monarch_l">
-      <description value="Monarch Envelope landscape"/>
+      <description translate="value" value="Monarch Envelope landscape"/>
       <comment value="3.875in x 7.5in landscape"/>
       <width value="540"/>
       <height value="279"/>
@@ -1103,54 +1142,54 @@
       <type value="envelope"/>
     </paper>
     <paper name="w288h387">
-      <description value="4x5 3/8"/>
+      <description translate="value" value="4x5 3/8"/>
       <width value="288"/>
       <height value="387"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w288h504">
-      <description value="4x7"/>
+      <description translate="value" value="4x7"/>
       <width value="288"/>
       <height value="504"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w253h337">
-      <description value="CP_L"/>
+      <description translate="value" value="CP_L"/>
       <comment value="89mm x 119mm"/>
       <width value="253"/>
       <height value="337"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w155h244">
-      <description value="Card"/>
+      <description translate="value" value="Card"/>
       <comment value="54mm x 86mm"/>
       <width value="155"/>
       <height value="244"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w283h566">
-      <description value="Wide Postcard"/>
+      <description translate="value" value="Wide Postcard"/>
       <comment value="100mm x 200mm"/>
       <width value="283"/>
       <height value="566"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w612h935">
-      <description value="Chilean Office"/>
+      <description translate="value" value="Chilean Office"/>
       <comment value="215.9mm x 330mm"/>
       <width value="612"/>
       <height value="935"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1224h1584">
-      <description value="Chilean Double Letter"/>
+      <description translate="value" value="Chilean Double Letter"/>
       <comment value="431.8mm x 558.8mm"/>
       <width value="1224"/>
       <height value="1584"/>
       <unit value="english-extended"/>
     </paper>
     <paper name="w1224h1871">
-      <description value="Chilean Double Office"/>
+      <description translate="value" value="Chilean Double Office"/>
       <comment value="215.9mm x 660mm"/>
       <width value="1224"/>
       <height value="1871"/>
@@ -1160,7 +1199,7 @@
     Custom
 -->
     <paper name="Custom">
-      <description value="Custom"/>
+      <description translate="value" value="Custom"/>
       <comment value="User-Defined Size"/>
       <width value="0"/>
       <height value="0"/>
@@ -1168,58 +1207,76 @@
     </paper>
 <!-- Group: Roll Papers -->
     <paper name="w252">
-      <description value="89 mm Roll Paper"/>
+      <description translate="value" value="89 mm Roll Paper"/>
       <width value="252"/>
       <height value="0"/>
       <unit value="metric"/>
     </paper>
     <paper name="w288">
-      <description value="4 Inch Roll Paper"/>
+      <description translate="value" value="4 Inch Roll Paper"/>
       <width value="288"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w360">
-      <description value="5 Inch Roll Paper"/>
+      <description translate="value" value="5 Inch Roll Paper"/>
       <width value="360"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w595">
-      <description value="210 mm Roll Paper"/>
+      <description translate="value" value="210 mm Roll Paper"/>
       <width value="595"/>
       <height value="0"/>
       <unit value="metric"/>
     </paper>
     <paper name="w936">
-      <description value="13 Inch Roll Paper"/>
+      <description translate="value" value="13 Inch Roll Paper"/>
       <width value="936"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
+    <paper name="w1224">
+      <description translate="value" value="17 Inch Roll Paper"/>
+      <width value="1224"/>
+      <height value="0"/>
+      <unit value="english"/>
+    </paper>
     <paper name="w1584">
-      <description value="22 Inch Roll Paper"/>
+      <description translate="value" value="22 Inch Roll Paper"/>
       <width value="1584"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w1728">
-      <description value="24 Inch Roll Paper"/>
+      <description translate="value" value="24 Inch Roll Paper"/>
       <width value="1728"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w2592">
-      <description value="36 Inch Roll Paper"/>
+      <description translate="value" value="36 Inch Roll Paper"/>
       <width value="2592"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
     <paper name="w3168">
-      <description value="44 Inch Roll Paper"/>
+      <description translate="value" value="44 Inch Roll Paper"/>
       <width value="3168"/>
       <height value="0"/>
       <unit value="english"/>
     </paper>
+    <paper name="w4320">
+      <description translate="value" value="60 Inch Roll Paper"/>
+      <width value="4320"/>
+      <height value="0"/>
+      <unit value="english"/>
+    </paper>
+    <paper name="w4608">
+      <description translate="value" value="64 Inch Roll Paper"/>
+      <width value="4608"/>
+      <height value="0"/>
+      <unit value="english"/>
+    </paper>
   </paperdef>
 </gutenprint>
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
new file mode 100644
index 0000000..f3b211a
--- /dev/null
+++ b/src/xml/printers.xml
@@ -0,0 +1,1557 @@
+<?xml version="1.0"?>
+
+<!--
+   "$Id: printers.xml,v 1.19 2008/10/19 13:57:27 rlk Exp $"
+
+   XML description of printers known to libgutenprint
+   You can add additional printers here, but the underlying driver has
+   to know about the model number.  You can have different printers
+   with the same model number but different parameters; this means
+   printers that are functionally identical but have different ink
+   characteristics.
+
+   NOTE TO TRANSLATORS: Printer names should not be translated into
+   their equivalents (the same printer sold under a different name) 
+   in other countries.  The correct way to handle this is to add
+   another printer to this list.  Translations should be done for 
+   e. g. character sets.
+
+   For example, a Japanese printer will have the same model name wherever
+   it is used and with whatever language the user speaks.
+-->
+
+<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>
+  <printdef>
+    <family name="ps">
+      <printer translate="name" name="PostScript Level 1" driver="ps" manufacturer="Adobe" model="0" />
+      <printer translate="name" name="PostScript Level 2" driver="ps2" manufacturer="Adobe" model="1" />
+    </family>
+    <family name="canon">
+      <parameters name="density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+      </parameters>
+      <parameters name="gamma_5_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">0.5</parameter>
+      </parameters>
+      <parameters name="gamma_6_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">0.6</parameter>
+      </parameters>
+      <parameters name="gamma_8_density_900_params">
+        <parameter type="float" name="Density">0.9</parameter>
+        <parameter type="float" name="Gamma">0.8</parameter>
+      </parameters>
+      <parameters name="gamma_2_density_800_params">
+        <parameter type="float" name="Density">0.8</parameter>
+        <parameter type="float" name="Gamma">2.0</parameter>
+      </parameters>
+      <parameters name="gamma_750_params">
+        <parameter type="float" name="Gamma">0.75</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4000_params">
+        <parameter type="float" name="Gamma">0.60</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4200_params">
+        <parameter type="float" name="Brightness">1.30</parameter>
+        <parameter type="float" name="Gamma">0.70</parameter>
+        <parameter type="float" name="Density">0.80</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4300_params">
+        <parameter type="float" name="Brightness">0.7</parameter>
+        <parameter type="float" name="Density">0.6</parameter>
+        <parameter type="float" name="Contrast">1.7</parameter>
+        <parameter type="float" name="Gamma">0.9</parameter>
+        <parameter type="float" name="BlackGamma">0.6</parameter>
+      </parameters>
+      <parameters name="PIXMA_iX5000_params"> 
+        <parameter type="float" name="BlackGamma">2.0</parameter> 
+        <parameter type="float" name="YellowGamma">1.4</parameter> 
+        <parameter type="float" name="MagentaGamma">1.3</parameter> 
+        <parameter type="float" name="CyanGamma">1.3</parameter> 
+      </parameters>
+      <printer translate="name" name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
+      <printer translate="name" name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-80" driver="bjc-80" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-85" driver="bjc-85" manufacturer="Canon" model="85" parameters="gamma_5_density_800_params" />
+      <printer translate="name" name="Canon BJC-210" driver="bjc-210" manufacturer="Canon" model="210" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-240" driver="bjc-240" manufacturer="Canon" model="240" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-250" driver="bjc-250" manufacturer="Canon" model="250" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-1000" driver="bjc-1000" manufacturer="Canon" model="1000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-2000" driver="bjc-2000" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-2010" driver="bjc-2010" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-2100" driver="bjc-2100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-2110" driver="bjc-2110" manufacturer="Canon" model="2000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-3000" driver="bjc-3000" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-4300" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-4400" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-6000" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6100" driver="bjc-6100" manufacturer="Canon" model="6100" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-6200" driver="bjc-6200" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-6500" driver="bjc-6500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon BJC-7000" driver="bjc-7000" manufacturer="Canon" model="7000" parameters="gamma_6_density_800_params" />
+      <printer translate="name" name="Canon BJC-7100" driver="bjc-7100" manufacturer="Canon" model="7100" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon BJC-8500" driver="bjc-8500" manufacturer="Canon" model="8500" parameters="density_800_params" />
+      <printer translate="name" name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" />
+      <printer translate="name" name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" />
+      <printer translate="name" name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
+      <printer translate="name" name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" />
+      <printer translate="name" name="Canon S600" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
+      <printer translate="name" name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
+      <printer translate="name" name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" />
+      <printer translate="name" name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" />
+      <printer translate="name" name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" />
+      <printer translate="name" name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP6000D" driver="bjc-PIXMA-iP6000D" manufacturer="Canon" model="3006000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" />
+      <printer translate="name" name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP160" driver="bjc-MULTIPASS-MP160" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP520" driver="bjc-MULTIPASS-MP520" manufacturer="Canon" model="5000520" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000740" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" />
+      <printer translate="name" name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" />
+      <printer translate="name" name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
+    </family>
+    <family name="escp2">
+      <parameters name="standard_params">
+        <parameter type="float" name="Gamma">0.470</parameter>
+      </parameters>
+      <parameters name="480_params">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+      </parameters>
+      <parameters name="pro_5500_params">
+        <parameter type="float" name="CyanGamma">0.8</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+      </parameters>
+      <parameters name="cx3500_params">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+      </parameters>
+      <parameters name="claria_params">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="BlackDensity">0.8</parameter>
+      </parameters>
+      <printer translate="name" name="Epson Artisan 700" driver="escp2-artisan700" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Artisan 800" driver="escp2-artisan800" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson B-300" driver="escp2-b300" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson B-308" driver="escp2-b308" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson B-500DN" driver="escp2-b500dn" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson B-508DN" driver="escp2-b508dn" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C40UX" driver="escp2-c40ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C41UX" driver="escp2-c41ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C42UX" driver="escp2-c42ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C43UX" driver="escp2-c43ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C44UX" driver="escp2-c44ux" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C45" driver="escp2-c45" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C46" driver="escp2-c46" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus C60" driver="escp2-c60" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C61" driver="escp2-c61" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C62" driver="escp2-c62" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C63" driver="escp2-c63" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C64" driver="escp2-c64" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C65" driver="escp2-c65" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C110" driver="escp2-c110" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus C120" driver="escp2-c120" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color I" driver="escp2-i" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color II" driver="escp2-ii" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color IIs" driver="escp2-iis" manufacturer="Epson" model="0" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color PRO" driver="escp2-pro" manufacturer="Epson" model="45" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro XL" driver="escp2-pro-xl" manufacturer="Epson" model="39" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 400" driver="escp2-400" manufacturer="Epson" model="1" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 440" driver="escp2-440" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 460" driver="escp2-460" manufacturer="Epson" model="10" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 480" driver="escp2-480" manufacturer="Epson" model="21" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus Color 500" driver="escp2-500" manufacturer="Epson" model="1" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 580" driver="escp2-580" manufacturer="Epson" model="38" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus Color 600" driver="escp2-600" manufacturer="Epson" model="3" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 640" driver="escp2-640" manufacturer="Epson" model="11" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 660" driver="escp2-660" manufacturer="Epson" model="18" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 670" driver="escp2-670" manufacturer="Epson" model="25" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 680" driver="escp2-680" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 740" driver="escp2-740" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 760" driver="escp2-760" manufacturer="Epson" model="19" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 777" driver="escp2-777" manufacturer="Epson" model="32" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 800" driver="escp2-800" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 850" driver="escp2-850" manufacturer="Epson" model="5" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 860" driver="escp2-860" manufacturer="Epson" model="16" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 880" driver="escp2-880" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 8 3" driver="escp2-83" manufacturer="Epson" model="33" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 900" driver="escp2-900" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 980" driver="escp2-980" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1160" driver="escp2-1160" manufacturer="Epson" model="17" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1500" driver="escp2-1500" manufacturer="Epson" model="2" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 1520" driver="escp2-1520" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Color 3000" driver="escp2-3000" manufacturer="Epson" model="24" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office B40W" driver="escp2-of-b40w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T30" driver="escp2-of-t30" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T33" driver="escp2-of-t33" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office T40W" driver="escp2-of-t40w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Offixe TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo EX" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo EX3" driver="escp2-ex3" manufacturer="Epson" model="54" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 720" driver="escp2-720" manufacturer="Epson" model="20" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 750" driver="escp2-750" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 780" driver="escp2-780" manufacturer="Epson" model="35" parameters="standard_params" />
+    <!--
+         Note that the 785EPX has a roll feed holder.  It's more like the 890
+         than the 780, despite the name.
+    -->
+      <printer translate="name" name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 870" driver="escp2-870" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 875" driver="escp2-875" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 890" driver="escp2-890" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 895" driver="escp2-895" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 900" driver="escp2-ph900" manufacturer="Epson" model="62" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 915" driver="escp2-915" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 925" driver="escp2-925" manufacturer="Epson" model="51" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 935" driver="escp2-935" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 950" driver="escp2-950" manufacturer="Epson" model="46" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 960" driver="escp2-960" manufacturer="Epson" model="46" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1200" driver="escp2-1200" manufacturer="Epson" model="15" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R265" driver="escp2-r265" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R270" driver="escp2-r270" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R280" driver="escp2-r280" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R285" driver="escp2-r285" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R290" driver="escp2-r290" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R390" driver="escp2-r390" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R1900" driver="escp2-r1900" manufacturer="Epson" model="91" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX585" driver="escp2-rx585" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX590" driver="escp2-rx590" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX595" driver="escp2-rx595" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX610" driver="escp2-rx610" manufacturer="Epson" model="81" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 7500" driver="escp2-7500" manufacturer="Epson" model="29" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson Stylus Pro 7600" driver="escp2-7600" manufacturer="Epson" model="48" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 7800" driver="escp2-7800" manufacturer="Epson" model="48" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 7880" driver="escp2-7880" manufacturer="Epson" model="89" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9800" driver="escp2-9800" manufacturer="Epson" model="49" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 9880" driver="escp2-9880" manufacturer="Epson" model="90" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Pro 11880" driver="escp2-11880" manufacturer="Epson" model="88" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Scan 2000" driver="escp2-scan2000" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Scan 2500" driver="escp2-scan2500" manufacturer="Epson" model="12" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX1500" driver="escp2-cx1500" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson Stylus CX3100" driver="escp2-cx3100" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3200" driver="escp2-cx3200" manufacturer="Epson" model="52" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3500" driver="escp2-cx3500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3600" driver="escp2-cx3600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3650" driver="escp2-cx3650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3805" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX4100" driver="escp2-cx4100" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX4500" driver="escp2-cx4500" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX4900" driver="escp2-cx4900" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5500" driver="escp2-cx5500" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX5600" driver="escp2-cx5600" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7400" driver="escp2-cx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9300F" driver="escp2-cx9300f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9400" driver="escp2-cx9400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9400F" driver="escp2-cx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D92" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX4400" driver="escp2-dx4400" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4450" driver="escp2-dx4450" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX7000F" driver="escp2-dx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX7400" driver="escp2-dx7400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX7450" driver="escp2-dx7450" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX8400" driver="escp2-dx8400" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX8450" driver="escp2-dx8450" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus DX9400F" driver="escp2-dx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Stylus NX100" driver="escp2-nx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus PX700FW" driver="escp2-px700fw" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX105" driver="escp2-sx105" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX200" driver="escp2-sx200" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX205" driver="escp2-sx205" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX400" driver="escp2-sx400" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus SX405" driver="escp2-sx405" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus T20" driver="escp2-t20" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX100" driver="escp2-tx100" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX200" driver="escp2-tx200" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus TX400" driver="escp2-tx400" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Dash" driver="escp2-picmatedash" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Flash" driver="escp2-picmateflash" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Pal" driver="escp2-picmatepal" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate Snap" driver="escp2-picmatesnap" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 100" driver="escp2-picmate100" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 200" driver="escp2-picmate200" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 210" driver="escp2-picmate210" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 215" driver="escp2-picmate215" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 240" driver="escp2-picmate240" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 250" driver="escp2-picmate250" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 260" driver="escp2-picmate260" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 270" driver="escp2-picmate270" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 280" driver="escp2-picmate280" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 290" driver="escp2-picmate290" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 500" driver="escp2-picmate500" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson PictureMate 2005" driver="escp2-picmate2005" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 30" driver="escp2-wf30" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 40" driver="escp2-wf40" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 500" driver="escp2-wf500" manufacturer="Epson" model="93" parameters="standard_params" />
+      <printer translate="name" name="Epson WorkForce 600" driver="escp2-wf600" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
+      <printer translate="name" name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
+      <printer translate="name" name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
+      <printer translate="name" name="Epson E 100" driver="escp2-e100" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson E 150" driver="escp2-e150" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 200" driver="escp2-e200" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer translate="name" name="Epson E 300" driver="escp2-e300" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 500" driver="escp2-e500" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 520" driver="escp2-e520" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 700" driver="escp2-e700" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson E 720" driver="escp2-e720" manufacturer="Epson" model="86" parameters="standard_params" />
+      <printer translate="name" name="Epson EM 900C" driver="escp2-em900c" manufacturer="Epson" model="13" parameters="standard_params" />
+      <printer translate="name" name="Epson EM 930C" driver="escp2-em930c" manufacturer="Epson" model="34" parameters="standard_params" />
+      <printer translate="name" name="Epson MC 2000" driver="escp2-mc2000" manufacturer="Epson" model="26" parameters="standard_params" />
+      <printer translate="name" name="Epson MC 5000" driver="escp2-mc5000" manufacturer="Epson" model="40" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson MC 7000" driver="escp2-mc7000" manufacturer="Epson" model="29" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson MC 9000" driver="escp2-mc9000" manufacturer="Epson" model="31" parameters="pro_5500_params" />
+      <printer translate="name" name="Epson MC 10000" driver="escp2-mc10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 70" driver="escp2-meof70" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 80W" driver="escp2-meof80w" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson ME Office 700FW" driver="escp2-meof700fw" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 6000C" driver="escp2-mj6000c" manufacturer="Epson" model="6" parameters="standard_params" />
+      <printer translate="name" name="Epson MJ 8000C" driver="escp2-mj8000c" manufacturer="Epson" model="24" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 670C" driver="escp2-pm670c" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 700C" driver="escp2-pm700c" manufacturer="Epson" model="9" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 730C" driver="escp2-pm730c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 740C" driver="escp2-pm740c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 750C" driver="escp2-pm750c" manufacturer="Epson" model="7" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 760C" driver="escp2-pm760c" manufacturer="Epson" model="20" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 770C" driver="escp2-pm770c" manufacturer="Epson" model="14" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 780C" driver="escp2-pm780c" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 790PT" driver="escp2-pm790pt" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 800C" driver="escp2-pm800c" manufacturer="Epson" model="22" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 850PT" driver="escp2-pm850pt" manufacturer="Epson" model="51" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 870C" driver="escp2-pm870c" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 880C" driver="escp2-pm880c" manufacturer="Epson" model="36" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 930C" driver="escp2-pm930c" manufacturer="Epson" model="58" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 940C" driver="escp2-pm940c" manufacturer="Epson" model="58" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 950C" driver="escp2-pm950c" manufacturer="Epson" model="53" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 970C" driver="escp2-pm970c" manufacturer="Epson" model="57" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 980C" driver="escp2-pm980c" manufacturer="Epson" model="57" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 2000C" driver="escp2-pm2000c" manufacturer="Epson" model="8" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 2200C" driver="escp2-pm2200c" manufacturer="Epson" model="54" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3000C" driver="escp2-pm3000c" manufacturer="Epson" model="15" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3300C" driver="escp2-pm3300c" manufacturer="Epson" model="23" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3500C" driver="escp2-pm3500c" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 3700C" driver="escp2-pm3700c" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 4000PX" driver="escp2-pm4000px" manufacturer="Epson" model="47" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 5000C" driver="escp2-pm5000c" manufacturer="Epson" model="27" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 7000C" driver="escp2-pm7000c" manufacturer="Epson" model="28" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 9000C" driver="escp2-pm9000c" manufacturer="Epson" model="30" parameters="standard_params" />
+      <printer translate="name" name="Epson PM 10000" driver="escp2-pm10000" manufacturer="Epson" model="41" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A650" driver="escp2-pma650" manufacturer="Epson" model="74" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A750" driver="escp2-pma750" manufacturer="Epson" model="75" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A820" driver="escp2-pma820" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM D870" driver="escp2-pmd870" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer translate="name" name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer translate="name" name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
+      <printer translate="name" name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer translate="name" name="Epson Offirio PX B300" driver="escp2-pxb300" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson Offirio PX B500" driver="escp2-pxb500" manufacturer="Epson" model="87" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 101" driver="escp2-px101" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 201" driver="escp2-px201" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 601F" driver="escp2-px601f" manufacturer="Epson" model="92" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G5000" driver="escp2-pxg5000" manufacturer="Epson" model="67" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G5300" driver="escp2-pxg5300" manufacturer="Epson" model="91" parameters="standard_params" />
+      <printer translate="name" name="Epson PX V500" driver="escp2-pxv500" manufacturer="Epson" model="61" parameters="standard_params" />
+      <printer translate="name" name="Epson PX V600" driver="escp2-pxv600" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson PX V630" driver="escp2-pxv630" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer translate="name" name="Epson PX V780" driver="escp2-pxv780" manufacturer="Epson" model="85" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 5500" driver="escp2-px5500" manufacturer="Epson" model="71" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 7000" driver="escp2-px7000" manufacturer="Epson" model="48" parameters="standard_params" />
+      <printer translate="name" name="Epson PX 9000" driver="escp2-px9000" manufacturer="Epson" model="49" parameters="standard_params" />
+    </family>
+    <family name="pcl">
+      <parameters name="pcl_inkjet_params">
+        <parameter type="float" name="Gamma">0.818</parameter>
+        <parameter type="float" name="Density">0.786</parameter>
+      </parameters>
+      <parameters name="pcl_laser_params">
+        <parameter type="float" name="Gamma">1.000</parameter>
+        <parameter type="float" name="Density">1.000</parameter>
+      </parameters>
+      <printer translate="name" name="Apollo P-2100" driver="pcl-apollo-p2100" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2150" driver="pcl-apollo-p2150" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2200" driver="pcl-apollo-p2200" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2250" driver="pcl-apollo-p2250" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2500" driver="pcl-apollo-p2500" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2550" driver="pcl-apollo-p2550" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2600" driver="pcl-apollo-p2600" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apollo P-2650" driver="pcl-apollo-p2650" manufacturer="Apollo" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Apple Color StyleWriter 4100" driver="pcl-apple-4100" manufacturer="Apple" model="601" parameters="pcl_inkjet_params" />	<!-- Uses 600 series driver -->
+      <printer translate="name" name="Apple Color StyleWriter 4500" driver="pcl-apple-4500" manufacturer="Apple" model="690" parameters="pcl_inkjet_params" />	<!-- Uses 690 driver -->
+      <printer translate="name" name="Apple Color StyleWriter 6500" driver="pcl-apple-6500" manufacturer="Apple" model="800" parameters="pcl_inkjet_params" />	<!-- Uses 850 driver -->
+      <printer translate="name" name="Apple LaserWriter Select 360" driver="pcl-apple-lw360" manufacturer="Apple" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother DCP-1200" driver="brother-dcp-1200" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother DCP-8045D" driver="brother-dcp-8045d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1040" driver="brother-hl-1040" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1050" driver="brother-hl-1050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1060" driver="brother-hl-1060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1070" driver="brother-hl-1070" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-10V" driver="brother-hl-10v" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-10h" driver="brother-hl-10h" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1240" driver="brother-hl-1240" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1250" driver="brother-hl-1250" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1260" driver="brother-hl-1260" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1270N" driver="brother-hl-1270n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1430" driver="brother-hl-1430" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1440" driver="brother-hl-1440" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1450" driver="brother-hl-1450" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1470N" driver="brother-hl-1470n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1650" driver="brother-hl-1650" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1660e" driver="brother-hl-1660e" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1670N" driver="brother-hl-1670n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2460" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-4Ve" driver="brother-hl-4ve" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5030" driver="brother-hl-5030" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5040" driver="brother-hl-5040" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5050" driver="brother-hl-5050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5070N" driver="brother-hl-5070n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5140" driver="brother-hl-5140" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5150D" driver="brother-hl-5150d" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-5170DN" driver="brother-hl-5170dn" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-630" driver="brother-hl-630" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-660" driver="brother-hl-660" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-7050" driver="brother-hl-7050" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-7050N" driver="brother-hl-7050n" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-760" driver="brother-hl-760" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother HL-960" driver="brother-hl-960" manufacturer="Brother" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-6550MC" driver="brother-mfc-6550mc" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-8300" driver="brother-mfc-8300" manufacturer="Brother" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-9500" driver="brother-mfc-9500" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Brother MFC-9600" driver="brother-mfc-9600" manufacturer="Brother" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon GP 335" driver="canon-gp_335" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-4sx" driver="canon-lbp-4sx" manufacturer="Canon" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-430" driver="canon-lbp-430" manufacturer="Canon" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1000" driver="canon-lbp-1000" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1260" driver="canon-lbp-1260" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon LBP-1760" driver="canon-lbp-1760" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Canon imageRunner 330s" driver="canon-ir_330s" manufacturer="Canon" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Citizen ProJet II" driver="citizen-projet_ii" manufacturer="Citizen" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="DEC 1800" driver="dec-1800" manufacturer="DEC" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="DEC LN17" driver="dec-ln17" manufacturer="DEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson ActionLaser 1100" driver="epson-actl_1100" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson ActionLaser II" driver="epson-actl_ii" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C2000" driver="epson-acl_c2000" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C2000PS" driver="epson-acl_c2000ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8500" driver="epson-acl_c8500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8500PS" driver="epson-acl_c8500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8600" driver="epson-acl_c8600" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson AcuLaser C8600PS" driver="epson-acl_c8600ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5200" driver="epson-epl-5200" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5200+" driver="epson-epl-5200plus" manufacturer="Epson" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5700" driver="epson-epl-5700" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5700PS" driver="epson-epl-5700ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5800" driver="epson-epl-5800" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5800PS" driver="epson-epl-5800ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5900" driver="epson-epl-5900" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-5900PS" driver="epson-epl-5900ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-6100" driver="epson-epl-6100" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-6100PS" driver="epson-epl-6100ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-7100" driver="epson-epl-7100" manufacturer="Epson" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050" driver="epson-epl-n2050" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050+" driver="epson-epl-n2050plus" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050PS" driver="epson-epl-n2050ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2050PS+" driver="epson-epl-n2050psplus" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2120" driver="epson-epl-n2120" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2500" driver="epson-epl-n2500" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2500PS" driver="epson-epl-n2500ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2750" driver="epson-epl-n2750" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Epson EPL-N2750PS" driver="epson-epl-n2750ps" manufacturer="Epson" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 10V" driver="fujitsu-pp_10v" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 16DV" driver="fujitsu-pp_16dv" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 20W" driver="fujitsu-pp_20w" manufacturer="Fujitsu" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Fujitsu PrintPartner 8000" driver="fujitsu-pp_8000" manufacturer="Fujitsu" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 4 Printer" driver="pcl-g_4" manufacturer="Generic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 4 LF Printer" driver="pcl-g_4_l" manufacturer="Generic" model="23" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5 Printer" driver="pcl-g_5" manufacturer="Generic" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5 LF Printer" driver="pcl-g_5_l" manufacturer="Generic" model="33" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5c Printer" driver="pcl-g_5c" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5c LF Printer" driver="pcl-g_5c_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5e Printer" driver="pcl-g_5e" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 5e LF Printer" driver="pcl-g_5e_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 6/PCL XL Printer" driver="pcl-g_6" manufacturer="Generic" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Generic PCL 6/PCL XL LF Printer" driver="pcl-g_6_l" manufacturer="Generic" model="61" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 10512" driver="gestetner-10512" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 2212" driver="gestetner-2212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 2712" driver="gestetner-2712" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3212" driver="gestetner-3212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3502" driver="gestetner-3502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3532" driver="gestetner-3532" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4502" driver="gestetner-4502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4532" driver="gestetner-4532" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 6002" driver="gestetner-6002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 7502" driver="gestetner-7502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 9002" driver="gestetner-9002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm415" driver="gestetner-dsm415" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm615" driver="gestetner-dsm615" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm616" driver="gestetner-dsm616" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm618" driver="gestetner-dsm618" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm618d" driver="gestetner-dsm618d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm620" driver="gestetner-dsm620" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm620d" driver="gestetner-dsm620d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm622" driver="gestetner-dsm622" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm627" driver="gestetner-dsm627" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm635" driver="gestetner-dsm635" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm645" driver="gestetner-dsm645" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DS645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm651" driver="gestetner-dsm651" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm660" driver="gestetner-dsm660" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm675" driver="gestetner-dsm675" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm725" driver="gestetner-dsm725" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm730" driver="gestetner-dsm730" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm735" driver="gestetner-dsm735" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm745" driver="gestetner-dsm745" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1100" driver="gestetner-mp1100" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1350" driver="gestetner-mp1350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1600" driver="gestetner-mp1600" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP2000" driver="gestetner-mp2000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP2500" driver="gestetner-mp2500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP3500" driver="gestetner-mp3500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP4500" driver="gestetner-mp4500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP5500" driver="gestetner-mp5500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP6500" driver="gestetner-mp6500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP7500" driver="gestetner-mp7500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP9000" driver="gestetner-mp9000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 161" driver="gestetner-mp_161" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm416" driver="gestetner-dsm416" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 2510" driver="gestetner-mp_2510" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 2550" driver="gestetner-mp_2550" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 2550B" driver="gestetner-mp_2550b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3010" driver="gestetner-mp_3010" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3350" driver="gestetner-mp_3350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3350B" driver="gestetner-mp_3350b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 4000" driver="gestetner-mp_4000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 4000B" driver="gestetner-mp_4000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 5000" driver="gestetner-mp_5000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 5000B" driver="gestetner-mp_5000b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Business Inkjet 2200" driver="hp-bij_2200" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2230" driver="hp-bij_2230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250" driver="hp-bij_2250" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2250TN" driver="hp-bij_2250tn" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Business Inkjet 2280" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color Inkjet Printer CP1700" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP Color LaserJet 2500" driver="hp-clj_2500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4500" driver="hp-clj_4500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4550" driver="hp-clj_4550" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 4600" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 5500" driver="hp-clj_5500" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Color LaserJet 8550GN" driver="hp-clj_8550gn" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP DesignJet 230" driver="pcl-desnj-230" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 250C" driver="pcl-desnj-250" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 430" driver="pcl-desnj-430" manufacturer="HP" model="10230" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 450C" driver="pcl-desnj-450" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 455CA" driver="pcl-desnj-455" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 488CA" driver="pcl-desnj-488" manufacturer="HP" model="10250" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 700" driver="pcl-desnj-700" manufacturer="HP" model="10700" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 750C Plus" driver="hp-desnj_750c_plus" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 750C" driver="pcl-750" manufacturer="HP" model="10750" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 2500CP" driver="pcl-desnj-2500" manufacturer="HP" model="12500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet 3500CP" driver="pcl-desnj-3500" manufacturer="HP" model="13500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DesignJet ColorPro CAD" driver="hp-desnj_cp_cad" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 400" driver="pcl-400" manufacturer="HP" model="400" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 420C" driver="hp-dj_420c" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 450" driver="hp-dj_450" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 500" driver="pcl-500" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 500C" driver="pcl-501" manufacturer="HP" model="501" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 505J Plus" driver="hp-dj_505j_plus" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 510" driver="hp-dj_510" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 520" driver="pcl-520" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 540C" driver="pcl-540" manufacturer="HP" model="540" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 550C" driver="pcl-550" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 5550" driver="hp-dj_5550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 5551" driver="hp-dj_5551" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 560C" driver="pcl-560" manufacturer="HP" model="550" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 600" driver="pcl-600" manufacturer="HP" model="600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 600C" driver="pcl-601" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610C" driver="hp-dj_610c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 610CL" driver="hp-dj_610cl" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 6122" driver="hp-dj_6122" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 6127" driver="hp-dj_6127" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 612C" driver="hp-dj_612c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 640C" driver="hp-dj_640c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 648C" driver="hp-dj_648c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 660C" driver="hp-dj_660c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 670C" driver="hp-dj_670c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 670TV" driver="hp-dj_670tv" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 672C" driver="hp-dj_672c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 680C" driver="hp-dj_680c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 682C" driver="hp-dj_682c" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 690C" driver="pcl-690" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 692C" driver="hp-dj_692c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 693C" driver="hp-dj_693c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 694C" driver="hp-dj_694c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 695C" driver="hp-dj_695c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 697C" driver="hp-dj_697c" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 810C" driver="pcl-810" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 812C" driver="pcl-812" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 815C" driver="hp-dj_815c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 816C" driver="hp-dj_816c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 825C" driver="hp-dj_825c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 830C" driver="hp-dj_830c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 832C" driver="hp-dj_832c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 840C" driver="pcl-840" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 841C" driver="hp-dj_841c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 842C" driver="pcl-842" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 843C" driver="hp-dj_843c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 845C" driver="pcl-845" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 850C" driver="pcl-850" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 855C" driver="pcl-855" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 870C" driver="pcl-870" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 880C" driver="hp-dj_880c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 882C" driver="hp-dj_882c" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 890C" driver="pcl-890" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 895C" driver="pcl-895" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />  <!-- Uses 840 driver -->
+      <printer translate="name" name="HP DeskJet 916C" driver="pcl-900" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 920C" driver="hp-dj_920c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 9300" driver="hp-dj_9300" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 930C" driver="hp-dj_930c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 932C" driver="hp-dj_932c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 933C" driver="hp-dj_933c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 934C" driver="hp-dj_934c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 935C" driver="hp-dj_935c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 940C" driver="hp-dj_940c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 948C" driver="hp-dj_948c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 950C" driver="hp-dj_950c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 952C" driver="hp-dj_952c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 955C" driver="hp-dj_955c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 957C" driver="hp-dj_957c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 959C" driver="hp-dj_959c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 960C" driver="hp-dj_960c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 970C" driver="hp-dj_970c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 975C" driver="hp-dj_975c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 980C" driver="hp-dj_980c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 990C" driver="hp-dj_990c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 995C" driver="hp-dj_995c" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1100C" driver="pcl-1100" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1120C" driver="pcl-1120" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1125C" driver="hp-dj_1125c" manufacturer="HP" model="1100" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1200C" driver="pcl-1200" manufacturer="HP" model="1200" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1220C" driver="pcl-1220" manufacturer="HP" model="901" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver (large) -->
+      <printer translate="name" name="HP DeskJet 1600C" driver="pcl-1600" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 1600CM" driver="hp-dj_1600cm" manufacturer="HP" model="1600" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 2000" driver="pcl-2000" manufacturer="HP" model="2000" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 2500" driver="pcl-2500" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 2500CM" driver="hp-2500cm" manufacturer="HP" model="2500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 340C" driver="pcl-340" manufacturer="HP" model="340" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3810" driver="hp-dj_3810" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3816" driver="hp-dj_3816" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3820" driver="hp-dj_3820" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP DeskJet 3822" driver="hp-dj_3822" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP LaserJet 2" driver="pcl-2" manufacturer="HP" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2D" driver="hp-lj_2d" manufacturer="HP" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2P Plus" driver="hp-lj_2p_plus" manufacturer="HP" model="21" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2P" driver="pcl-2p" manufacturer="HP" model="21" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3" driver="pcl-3" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3D" driver="hp-lj_3d" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3P w/ PCL5" driver="hp-lj_3p_w_pcl5" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3P w/PS" driver="hp-lj_3p_w_ps" manufacturer="HP" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4 Plus" driver="hp-lj_4_plus" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4" driver="pcl-4" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4L" driver="pcl-4l" manufacturer="HP" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4M" driver="hp-lj_4m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4ML" driver="hp-lj_4ml" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4P" driver="hp-lj_4p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4Si" driver="pcl-4si" manufacturer="HP" model="51" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4V" driver="pcl-4v" manufacturer="HP" model="5" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5" driver="pcl-5" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5L" driver="hp-lj_5l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5M" driver="hp-lj_5m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5MP" driver="hp-lj_5mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5P" driver="hp-lj_5p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5Si" driver="pcl-5si" manufacturer="HP" model="7" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6" driver="pcl-6" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6L" driver="hp-lj_6l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6MP" driver="hp-lj_6mp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 6P" driver="hp-lj_6p" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1010" driver="hp-lj_1010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1012" driver="hp-lj_1012" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1015" driver="hp-lj_1015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1022" driver="hp-lj_1022" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100" driver="hp-lj_1100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1100A" driver="hp-lj_1100a" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1150" driver="hp-lj_1150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1160" driver="hp-lj_1160" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1200" driver="hp-lj_1200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1220" driver="hp-lj_1220" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1300" driver="hp-lj_1300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 1320" driver="hp-lj_1320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100" driver="hp-lj_2100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2100M" driver="hp-lj_2100m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2200" driver="hp-lj_2200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2300" driver="hp-lj_2300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2410" driver="hp-lj_2410" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2420" driver="hp-lj_2420" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 2430" driver="hp-lj_2430" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3015" driver="hp-lj_3015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3020" driver="hp-lj_3020" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3030" driver="hp-lj_3030" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3050" driver="hp-lj_3050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3052" driver="hp-lj_3052" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3055" driver="hp-lj_3055" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200" driver="hp-lj_3200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200m" driver="hp-lj_3200m" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3200se" driver="hp-lj_3200se" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3300 MFP" driver="hp-lj_3300_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3310 MFP" driver="hp-lj_3310_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320 MFP" driver="hp-lj_3320_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3320N MFP" driver="hp-lj_3320n_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3330 MFP" driver="hp-lj_3330_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3380" driver="hp-lj_3380" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3390" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 3392" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4000" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4050" driver="hp-lj_4050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4100" driver="hp-lj_4100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4200" driver="hp-lj_4200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4240" driver="hp-lj_4240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4250" driver="hp-lj_4250" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4300" driver="hp-lj_4300" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4345 mfp" driver="hp-lj_4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 4350" driver="hp-lj_4350" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5000" driver="hp-lj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5100" driver="hp-lj_5100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5200" driver="hp-lj_5200" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 5200L" driver="hp-lj_5200l" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8000" driver="hp-lj_8000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 8150" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9040" driver="hp-lj_9040" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9040 MFP" driver="hp-lj_9040_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9050" driver="hp-lj_9050" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet 9050 MFP" driver="hp-lj_9050_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3027 MFP" driver="hp-lj_m3027_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M3035 MFP" driver="hp-lj_m3035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M4345 MFP" driver="hp-lj_m4345_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5025 MFP" driver="hp-lj_m5025_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet M5035 MFP" driver="hp-lj_m5035_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2010" driver="hp-lj_p2010" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P2015" driver="hp-lj_p2015" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3004" driver="hp-lj_p3004" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP LaserJet P3005" driver="hp-lj_p3005" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Mopier 240" driver="hp-mopier_240" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP Mopier 320" driver="hp-mopier_320" manufacturer="HP" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="HP OfficeJet 300" driver="hp-oj_300" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 330" driver="hp-oj_330" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 350" driver="hp-oj_350" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 500" driver="hp-oj_500" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 520" driver="hp-oj_520" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 570" driver="hp-oj_570" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 580" driver="hp-oj_580" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 590" driver="hp-oj_590" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 600" driver="hp-oj_600" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 610" driver="hp-oj_610" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 625" driver="hp-oj_625" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 630" driver="hp-oj_630" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 635" driver="hp-oj_635" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 700" driver="hp-oj_700" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 710" driver="hp-oj_710" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 720" driver="hp-oj_720" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 725" driver="hp-oj_725" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5105" driver="hp-oj_5105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5110" driver="hp-oj_5110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 5110xi" driver="hp-oj_5110xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6105" driver="hp-oj_6105" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 6110" driver="hp-oj_6110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7110" driver="hp-oj_7110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7130" driver="hp-oj_7130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet 7140" driver="hp-oj_7140" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D125" driver="hp-oj_d125" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D135" driver="hp-oj_d135" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D145" driver="hp-oj_d145" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet D155" driver="hp-oj_d155" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G55" driver="hp-oj_g55" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G85" driver="hp-oj_g85" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet G95" driver="hp-oj_g95" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60" driver="hp-oj_k60" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K60xi" driver="hp-oj_k60xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80" driver="hp-oj_k80" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet K80xi" driver="hp-oj_k80xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet LX" driver="hp-oj_lx" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1150C" driver="hp-oj_pro_1150c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1170C" driver="hp-oj_pro_1170c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet Pro 1175C" driver="hp-oj_pro_1175c" manufacturer="HP" model="800" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R40" driver="hp-oj_r40" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R45" driver="hp-oj_r45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R60" driver="hp-oj_r60" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R65" driver="hp-oj_r65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet R80" driver="hp-oj_r80" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T45" driver="hp-oj_t45" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet T65" driver="hp-oj_t65" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40" driver="hp-oj_v40" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet V40xi" driver="hp-oj_v40xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP OfficeJet" driver="hp-oj" manufacturer="HP" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 370" driver="hp-psc_370" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 380" driver="hp-psc_380" manufacturer="HP" model="690" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 500" driver="hp-psc_500" manufacturer="HP" model="840" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 750" driver="hp-psc_750" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950" driver="hp-psc_950" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 950xi" driver="hp-psc_950xi" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2110" driver="hp-psc_2110" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2150" driver="hp-psc_2150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PSC 2210" driver="hp-psc_2210" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7150" driver="hp-psc_7150" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7345" driver="hp-psc_7345" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7350" driver="hp-psc_7350" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart 7550" driver="hp-psc_7550" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P100" driver="hp-psc_p100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P130" driver="hp-psc_p130" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P230" driver="hp-psc_p230" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1000" driver="pcl-P1000" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1100" driver="pcl-P1100" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />  <!-- Uses 900 series driver -->
+      <printer translate="name" name="HP PhotoSmart P1115" driver="hp-psc_p1115" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1215" driver="hp-psc_p1215" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1218" driver="hp-psc_p1218" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP PhotoSmart P1315" driver="hp-psc_p1315" manufacturer="HP" model="900" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="HP e-printer e20" driver="hp-e-printer_e20" manufacturer="HP" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="IBM 4019" driver="ibm-4019" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM 4029 030 LaserPrinter 10" driver="ibm-4029_030_lp_10" manufacturer="IBM" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM 4312" driver="ibm-4312" manufacturer="IBM" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Infoprint 12" driver="ibm-infoprint_12" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="IBM Page Printer 3112" driver="ibm-pp_3112" manufacturer="IBM" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4353 MF" driver="infotec-4353_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4452 MF" driver="infotec-4452_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec 4651 MF" driver="infotec-4651_mf" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2022" driver="infotec-is2022" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2027" driver="infotec-is2027" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2032" driver="infotec-is2032" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2035" driver="infotec-is2035" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2045" driver="infotec-is2045" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2090" driver="infotec-is2090" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS2105" driver="infotec-is2105" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2015" driver="infotec-is_2015" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2018" driver="infotec-is_2018" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2018D" driver="infotec-is_2018d" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2060" driver="infotec-is_2060" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2075" driver="infotec-is_2075" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2122" driver="infotec-is_2122" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2127" driver="infotec-is_2127" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2132" driver="infotec-is_2132" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2135" driver="infotec-is_2135" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2145" driver="infotec-is_2145" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2151" driver="infotec-is_2151" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2160" driver="infotec-is_2160" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2175" driver="infotec-is_2175" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2215" driver="infotec-is_2215" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2216" driver="infotec-is_2216" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2220" driver="infotec-is_2220" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2220D" driver="infotec-is_2220d" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2225" driver="infotec-is_2225" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2230" driver="infotec-is_2230" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2235" driver="infotec-is_2235" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2245" driver="infotec-is_2245" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2255" driver="infotec-is_2255" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2265" driver="infotec-is_2265" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2275" driver="infotec-is_2275" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2316" driver="infotec-is_2316" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2320" driver="infotec-is_2320" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2325" driver="infotec-is_2325" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2416" driver="infotec-is_2416" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2425" driver="infotec-is_2425" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2430" driver="infotec-is_2430" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2435" driver="infotec-is_2435" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 2445" driver="infotec-is_2445" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 3090" driver="infotec-is_3090" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 3110" driver="infotec-is_3110" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec IS 3135" driver="infotec-is_3135" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 2550" driver="infotec-mp_2550" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 2550B" driver="infotec-mp_2550b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 3350" driver="infotec-mp_3350" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 3350B" driver="infotec-mp_3350b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 4000" driver="infotec-mp_4000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 4000B" driver="infotec-mp_4000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 5000" driver="infotec-mp_5000" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Infotec MP 5000B" driver="infotec-mp_5000b" manufacturer="Infotec" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera F-1010" driver="kyocera-f-1010" manufacturer="Kyocera" model="22" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-600 - KPDL-2" driver="kyocera-fs-600_kpdl-2" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-600" driver="kyocera-fs-600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-680" driver="kyocera-fs-680" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-800" driver="kyocera-fs-800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1000" driver="kyocera-fs-1000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1000+" driver="kyocera-fs-1000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1010" driver="kyocera-fs-1010" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1050" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1200" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1600" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1700" driver="kyocera-fs-1700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1700+" driver="kyocera-fs-1700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1750" driver="kyocera-fs-1750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1800" driver="kyocera-fs-1800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1800+" driver="kyocera-fs-1800plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-1900" driver="kyocera-fs-1900" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3500" driver="kyocera-fs-3500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3600" driver="kyocera-fs-3600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3600+" driver="kyocera-fs-3600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3700" driver="kyocera-fs-3700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3700+" driver="kyocera-fs-3700plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3750" driver="kyocera-fs-3750" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-3800" driver="kyocera-fs-3800" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5800C" driver="kyocera-fs-5800c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-5900C" driver="kyocera-fs-5900c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6500" driver="kyocera-fs-6500" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6500+" driver="kyocera-fs-6500plus" manufacturer="Kyocera" model="32" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-6700" driver="kyocera-fs-6700" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-7000" driver="kyocera-fs-7000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-7000+" driver="kyocera-fs-7000plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-8000C" driver="kyocera-fs-8000c" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9000" driver="kyocera-fs-9000" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9100DN" driver="kyocera-fs-9100dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera FS-9500DN" driver="kyocera-fs-9500dn" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1530" driver="kyocera-km-1530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-1810" driver="kyocera-km-1810" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2030" driver="kyocera-km-2030" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-2530" driver="kyocera-km-2530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-3530" driver="kyocera-km-3530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4230" driver="kyocera-km-4230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-4530" driver="kyocera-km-4530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5230" driver="kyocera-km-5230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-5530" driver="kyocera-km-5530" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Kyocera KM-6230" driver="kyocera-km-6230" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5622" driver="lanier-5622" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5627" driver="lanier-5627" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5632" driver="lanier-5632" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5635" driver="lanier-5635" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier 5645" driver="lanier-5645" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD0105" driver="lanier-ld0105" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD015" driver="lanier-ld015" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD035" driver="lanier-ld035" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD045" driver="lanier-ld045" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD060" driver="lanier-ld060" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD075" driver="lanier-ld075" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD090" driver="lanier-ld090" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD115" driver="lanier-ld115" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD116" driver="lanier-ld116" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD118" driver="lanier-ld118" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD118d" driver="lanier-ld118d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD120" driver="lanier-ld120" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD120d" driver="lanier-ld120d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD122" driver="lanier-ld122" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD127" driver="lanier-ld127" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD132" driver="lanier-ld132" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD135" driver="lanier-ld135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD145" driver="lanier-ld145" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD151" driver="lanier-ld151" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD160" driver="lanier-ld160" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD175" driver="lanier-ld175" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD225" driver="lanier-ld225" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD230" driver="lanier-ld230" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD235" driver="lanier-ld235" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD245" driver="lanier-ld245" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2500" driver="lanier-mp_2500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD125" driver="lanier-ld125" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1100" driver="lanier-mp_1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1350" driver="lanier-mp_1350" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1600" driver="lanier-mp_1600" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD316" driver="lanier-ld316" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 161" driver="lanier-mp_161" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD016" driver="lanier-ld016" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2000" driver="lanier-mp_2000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2510" driver="lanier-mp_2510" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD325" driver="lanier-ld325" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2550B" driver="lanier-mp_2550b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2550" driver="lanier-mp_2550" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD425" driver="lanier-ld425" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3010" driver="lanier-mp_3010" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD330" driver="lanier-ld330" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3350B" driver="lanier-mp_3350b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3350" driver="lanier-mp_3350" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD433" driver="lanier-ld433" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3500" driver="lanier-mp_3500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD335" driver="lanier-ld335" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4000B" driver="lanier-mp_4000b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4000" driver="lanier-mp_4000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD040" driver="lanier-ld040" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4500" driver="lanier-mp_4500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD345" driver="lanier-ld345" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5000B" driver="lanier-mp_5000b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5000" driver="lanier-mp_5000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD050" driver="lanier-ld050" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5500" driver="lanier-mp_5500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD255" driver="lanier-ld255" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 6500" driver="lanier-mp_6500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD265" driver="lanier-ld265" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 7500" driver="lanier-mp_7500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD275" driver="lanier-ld275" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 9000" driver="lanier-mp_9000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier LD190" driver="lanier-ld190" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E321" driver="lexmark-optra_e321" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Optra E323" driver="lexmark-optra_e323" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 6ex" driver="minolta-pp_6ex" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8" driver="minolta-pp_8" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 8L" driver="minolta-pp_8l" manufacturer="Minolta" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Minolta PagePro 1100" driver="minolta-pp_1100" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 660i" driver="nec-ssc_660i" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 860" driver="nec-ssc_860" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 870" driver="nec-ssc_870" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 10515" driver="nrg-10515" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 10518" driver="nrg-10518" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2205" driver="nrg-2205" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2238" driver="nrg-2238" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2705" driver="nrg-2705" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2738" driver="nrg-2738" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3205" driver="nrg-3205" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3238" driver="nrg-3238" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3212" driver="nrg-3212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3525" driver="nrg-3525" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3508" driver="nrg-3508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3502" driver="nrg-3502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3545" driver="nrg-3545" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3518" driver="nrg-3518" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3532" driver="nrg-3532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4525" driver="nrg-4525" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4508" driver="nrg-4508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4502" driver="nrg-4502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4545" driver="nrg-4545" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4518" driver="nrg-4518" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4532" driver="nrg-4532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 6002" driver="nrg-6002" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 6005" driver="nrg-6005" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 6008" driver="nrg-6008" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 7502" driver="nrg-7502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 7505" driver="nrg-7505" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 7508" driver="nrg-7508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 9005" driver="nrg-9005" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 9008" driver="nrg-9008" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 9002" driver="nrg-9002" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm415" driver="nrg-dsm415" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm615" driver="nrg-dsm615" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm616" driver="nrg-dsm616" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm618" driver="nrg-dsm618" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm618d" driver="nrg-dsm618d" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm620" driver="nrg-dsm620" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm620d" driver="nrg-dsm620d" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm622" driver="nrg-dsm622" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm627" driver="nrg-dsm627" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm632" driver="nrg-dsm632" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm635" driver="nrg-dsm635" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm645" driver="nrg-dsm645" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm651" driver="nrg-dsm651" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm660" driver="nrg-dsm660" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm675" driver="nrg-dsm675" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm725" driver="nrg-dsm725" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm730" driver="nrg-dsm730" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm735" driver="nrg-dsm735" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG DSm745" driver="nrg-dsm745" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1100" driver="nrg-mp_1100" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1350" driver="nrg-mp_1350" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 1600" driver="nrg-mp_1600" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 161" driver="nrg-mp_161" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2000" driver="nrg-mp_2000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2500" driver="nrg-mp_2500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2510" driver="nrg-mp_2510" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2550" driver="nrg-mp_2550" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 2550B" driver="nrg-mp_2550b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3010" driver="nrg-mp_3010" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3350" driver="nrg-mp_3350" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3350B" driver="nrg-mp_3350b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 3500" driver="nrg-mp_3500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4000" driver="nrg-mp_4000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4000B" driver="nrg-mp_4000b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 4500" driver="nrg-mp_4500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5000" driver="nrg-mp_5000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5000B" driver="nrg-mp_5000b" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 5500" driver="nrg-mp_5500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 6500" driver="nrg-mp_6500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 7500" driver="nrg-mp_7500" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG MP 9000" driver="nrg-mp_9000" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL400" driver="okidata-ol400" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL400e" driver="okidata-ol400e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL400ex" driver="okidata-ol400ex" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL410e" driver="okidata-ol410e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL600e" driver="okidata-ol600e" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL610e/S" driver="okidata-ol610e_s" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL800" driver="okidata-ol800" manufacturer="Oki" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki OL810ex" driver="okidata-ol810ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6e" driver="okidata-okp_6e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 6ex" driver="okidata-okp_6ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 8p" driver="okidata-okp_8p" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10e" driver="okidata-okp_10e" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 10ex" driver="okidata-okp_10ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Okipage 14ex" driver="okidata-okp_14ex" manufacturer="Oki" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Oki Super 6e" driver="okidata-super_6e" manufacturer="Oki" model="4" parameters="pcl_laser_params" />
+      <printer translate="name" name="Olivetti JP350S" driver="olivetti-jp350s" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Olivetti PG 306" driver="olivetti-pg_306" manufacturer="Olivetti" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="PCPI 1030" driver="pcpi-1030" manufacturer="PCPI" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P4410" driver="panasonic-kx-p4410" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P4450" driver="panasonic-kx-p4450" manufacturer="Panasonic" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P6150" driver="panasonic-kx-p6150" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Panasonic KX-P6500" driver="panasonic-kx-p6500" manufacturer="Panasonic" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Raven LP-410" driver="raven-lp-410" manufacturer="Raven" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1022" driver="ricoh-afc_1022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1027" driver="ricoh-afc_1027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1032" driver="ricoh-afc_1032" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1035" driver="ricoh-afc_1035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1045" driver="ricoh-afc_1045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1060" driver="ricoh-afc_1060" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1075" driver="ricoh-afc_1075" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 1515" driver="ricoh-afc_1515" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2015" driver="ricoh-afc_2015" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2016" driver="ricoh-afc_2016" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2018" driver="ricoh-afc_2018" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2018D" driver="ricoh-afc_2018d" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2020" driver="ricoh-afc_2020" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2020D" driver="ricoh-afc_2020d" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2022" driver="ricoh-afc_2022" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2027" driver="ricoh-afc_2027" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2032" driver="ricoh-afc_2032" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2035" driver="ricoh-afc_2035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2035e" driver="ricoh-afc_2035e" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2045" driver="ricoh-afc_2045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2045e" driver="ricoh-afc_2045e" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2051" driver="ricoh-afc_2051" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2060" driver="ricoh-afc_2060" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2075" driver="ricoh-afc_2075" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2090" driver="ricoh-afc_2090" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 2105" driver="ricoh-afc_2105" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 220" driver="ricoh-afc_220" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3025" driver="ricoh-afc_3025" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3030" driver="ricoh-afc_3030" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3035" driver="ricoh-afc_3035" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 3045" driver="ricoh-afc_3045" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 401" driver="ricoh-afc_401" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio 700" driver="ricoh-afc_700" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1100" driver="ricoh-afc_mp_1100" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1350" driver="ricoh-afc_mp_1350" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 1600" driver="ricoh-afc_mp_1600" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 161" driver="ricoh-afc_mp_161" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2000" driver="ricoh-afc_mp_2000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2500" driver="ricoh-afc_mp_2500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2510" driver="ricoh-afc_mp_2510" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2550" driver="ricoh-afc_mp_2550" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 2550B" driver="ricoh-afc_mp_2550b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3010" driver="ricoh-afc_mp_3010" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3350" driver="ricoh-afc_mp_3350" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3350B" driver="ricoh-afc_mp_3350b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 3500" driver="ricoh-afc_mp_3500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4000" driver="ricoh-afc_mp_4000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4000B" driver="ricoh-afc_mp_4000b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 4500" driver="ricoh-afc_mp_4500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5000" driver="ricoh-afc_mp_5000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5000B" driver="ricoh-afc_mp_5000b" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 5500" driver="ricoh-afc_mp_5500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 6500" driver="ricoh-afc_mp_6500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 7500" driver="ricoh-afc_mp_7500" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Ricoh Aficio MP 9000" driver="ricoh-afc_mp_9000" manufacturer="Ricoh" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-85" driver="samsung-ml-85" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1250" driver="samsung-ml-1250" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1450" driver="samsung-ml-1450" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1450PS" driver="samsung-ml-1450ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1650" driver="samsung-ml-1650" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1651N" driver="samsung-ml-1651n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-1750" driver="samsung-ml-1750" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2150" driver="samsung-ml-2150" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2150PS" driver="samsung-ml-2150ps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2151N" driver="samsung-ml-2151n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2151NPS" driver="samsung-ml-2151nps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2152W" driver="samsung-ml-2152w" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2152WPS" driver="samsung-ml-2152wps" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2250" driver="samsung-ml-2250" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2550" driver="samsung-ml-2550" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2551N" driver="samsung-ml-2551n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-2552W" driver="samsung-ml-2552w" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-4600" driver="samsung-ml-4600" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-5000a" driver="samsung-ml-5000a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-6000" driver="samsung-ml-6000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-6100" driver="samsung-ml-6100" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7000" driver="samsung-ml-7000" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7000N" driver="samsung-ml-7000n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7000P" driver="samsung-ml-7000p" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7050" driver="samsung-ml-7050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7300" driver="samsung-ml-7300" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung ML-7300N" driver="samsung-ml-7300n" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung QL-5100A" driver="samsung-ql-5100a" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Samsung QL-6050" driver="samsung-ql-6050" manufacturer="Samsung" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2522" driver="savin-2522" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2527" driver="savin-2527" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2532" driver="savin-2532" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2535" driver="savin-2535" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2235" driver="savin-2235" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2545" driver="savin-2545" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2245" driver="savin-2245" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2560" driver="savin-2560" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2575" driver="savin-2575" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 3515" driver="savin-3515" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 40105" driver="savin-40105" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4015" driver="savin-4015" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4018" driver="savin-4018" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4018d" driver="savin-4018d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4022" driver="savin-4022" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4027" driver="savin-4027" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4035" driver="savin-4035" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4135g" driver="savin-4135g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4035e" driver="savin-4035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4135eG" driver="savin-4135eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4045" driver="savin-4045" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4145g" driver="savin-4145g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4045e" driver="savin-4045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4145eG" driver="savin-4145eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4051" driver="savin-4051" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4060" driver="savin-4060" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4075" driver="savin-4075" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4090" driver="savin-4090" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 7025" driver="savin-7025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8016" driver="savin-8016" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8020" driver="savin-8020" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8020d" driver="savin-8020d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8025" driver="savin-8025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8025e" driver="savin-8025e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8030" driver="savin-8030" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8030e" driver="savin-8030e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8035" driver="savin-8035" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8035g" driver="savin-8035g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8035e" driver="savin-8035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8045" driver="savin-8045" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8045g" driver="savin-8045g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8045e" driver="savin-8045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8055" driver="savin-8055" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8065" driver="savin-8065" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8075" driver="savin-8075" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8090" driver="savin-8090" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8110" driver="savin-8110" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8135" driver="savin-8135" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 816" driver="savin-816" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9016" driver="savin-9016" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9021d" driver="savin-9021d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9025" driver="savin-9025" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9025b" driver="savin-9025b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9033" driver="savin-9033" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9033b" driver="savin-9033b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9040" driver="savin-9040" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9040b" driver="savin-9040b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9050" driver="savin-9050" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 9050b" driver="savin-9050b" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Seiko SpeedJET 200" driver="seiko-sj_200" manufacturer="Seiko" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sharp AR-161" driver="sharp-ar-161" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sharp AR-M257" driver="sharp-ar-m257" manufacturer="Sharp" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Sony IJP-V100" driver="sony-ijp-v100" manufacturer="Sony" model="601" parameters="pcl_inkjet_params" />
+      <printer translate="name" name="Star LS-04" driver="star-ls-04" manufacturer="Star" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Star LaserPrinter 8" driver="star-lp_8" manufacturer="Star" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Tally MT908" driver="tally-mt908" manufacturer="Tally" model="3" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox Able 1406" driver="xerox-able_1406" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint 4508" driver="xerox-dp_4508" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint C20" driver="xerox-dp_c20" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint N4512" driver="xerox-dp_n4512" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint N4512PS" driver="xerox-dp_n4512ps" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P12" driver="xerox-dp_p12" manufacturer="Xerox" model="2" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+    </family>
+    <family name="lexmark">
+      <parameters name="standard_params">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="Gamma">0.5</parameter>
+        <parameter type="float" name="Density">2.0</parameter>
+      </parameters>
+      <printer translate="name" name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+      <printer translate="name" name="Lexmark Z53" driver="lexmark-z53" manufacturer="Lexmark" model="10052" parameters="standard_params" />
+    </family>
+    <family name="dyesub">
+      <printer translate="name" name="Olympus P-10" driver="olympus-p10" manufacturer="Olympus" model="2" />
+      <printer translate="name" name="Olympus P-11" driver="olympus-p11" manufacturer="Olympus" model="2" />
+      <printer translate="name" name="Olympus P-200" driver="olympus-p200" manufacturer="Olympus" model="4" />
+      <printer translate="name" name="Olympus P-300" driver="olympus-p300" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-300E" driver="olympus-p300e" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-300U" driver="olympus-p300u" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-330E" driver="olympus-p330e" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-330NE" driver="olympus-p330ne" manufacturer="Olympus" model="0" />
+      <printer translate="name" name="Olympus P-400" driver="olympus-p400" manufacturer="Olympus" model="1" />
+      <printer translate="name" name="Olympus P-440" driver="olympus-p440" manufacturer="Olympus" model="3" />
+      <printer translate="name" name="Olympus P-S100" driver="olympus-ps100" manufacturer="Olympus" model="20" />
+      <printer translate="name" name="Canon CP-10" driver="canon-cp10" manufacturer="Canon" model="1002" />
+      <printer translate="name" name="Canon CP-100" driver="canon-cp100" manufacturer="Canon" model="1000" />
+      <printer translate="name" name="Canon CP-200" driver="canon-cp200" manufacturer="Canon" model="1000" />
+      <printer translate="name" name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon CP-300" driver="canon-cp300" manufacturer="Canon" model="1000" />
+      <printer translate="name" name="Canon CP-330" driver="canon-cp330" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-730" driver="canon-cp730" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-740" driver="canon-cp740" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-750" driver="canon-cp750" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY ES1" driver="canon-es1" manufacturer="Canon" model="1003" />
+      <printer translate="name" name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1003" />
+      <printer translate="name" name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1003" />
+      <printer translate="name" name="Sony DPP-EX5" driver="sony-dppex5" manufacturer="Sony" model="2002" />
+      <printer translate="name" name="Sony DPP-EX7" driver="sony-dppex5" manufacturer="Sony" model="2002" />
+      <printer translate="name" name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" />
+      <printer translate="name" name="Sony UP-DR100" driver="sony-updr100" manufacturer="Sony" model="2003" />
+      <printer translate="name" name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001" />
+      <printer translate="name" name="Fujifilm Printpix-CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000" />
+      <printer translate="name" name="Fujifilm Printpix-CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001" />
+      <printer translate="name" name="Fujifilm FinePix-NX-500" driver="fujifilm-nx500" manufacturer="Fujifilm" model="3002" />
+      <printer translate="name" name="Kodak Easyshare-Printer-Dock" driver="kodak-dock" manufacturer="Kodak" model="4000"/>
+      <printer translate="name" name="Shinko CHC-S9045" driver="shinko-chcs9045" manufacturer="Shinko" model="5000"/>
+    </family>
+    <family name="raw">
+      <printer translate="name" name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
+      <printer translate="name" name="RAW DATA 8 bit" driver="raw-data-8" manufacturer="" model="1" />
+    </family>
+  </printdef>
+</gutenprint>
diff --git a/test/Makefile.in b/test/Makefile.in
index 25a26a1..8e1e65e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,7 +17,7 @@
 # Variables
 
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-#export STP_DATA_PATH = $(top_srcdir)/src/main
+#export STP_DATA_PATH = $(top_srcdir)/src/xml
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -50,7 +50,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
 	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
 	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
@@ -84,7 +85,7 @@ unprint_DEPENDENCIES = $(GUTENPRINT_LIBS)
 am_xml_curve_OBJECTS = xml-curve.$(OBJEXT)
 xml_curve_OBJECTS = $(am_xml_curve_OBJECTS)
 xml_curve_DEPENDENCIES = $(GUTENPRINT_LIBS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -138,6 +139,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
 DVIPDF = @DVIPDF@
 DVIPS = @DVIPS@
 ECHO = @ECHO@
@@ -158,6 +160,7 @@ GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUCFLAGS = @GNUCFLAGS@
 GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
@@ -190,6 +193,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -210,9 +214,10 @@ MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -239,6 +244,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -441,8 +447,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -454,8 +460,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -465,13 +471,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff --git a/test/parse-escp2 b/test/parse-escp2
index ae95a5f..4664955 100755
--- a/test/parse-escp2
+++ b/test/parse-escp2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright 2000-2007 Robert Krawitz <rlk@alum.mit.edu>
+# Copyright 2000-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
@@ -26,8 +26,10 @@ use vars qw($atend
 	    $opt_v
 	    $opt_V
 	    $opt_O
+	    $curoffset
 	    $curpos
 	    $esc
+	    $initial_vertical_position
 	    $page_mgmt_unit
 	    $horizontal_position
 	    $horizontal_unit
@@ -37,9 +39,21 @@ use vars qw($atend
 	    $raster_y
 	    $print_offsets
 	    %seqtable
+	    @seqkeys
+	    %chartable
+	    %xchartable
+	    %nchartable
+	    %rchartable
+	    %keylengths
+	    $total_length
 	    @offsets);
 
 $atend = 0;
+%chartable = ();
+%xchartable = ();
+%nchartable = ();
+%rchartable = ();
+%keylengths = ();
 
 %seqtable = ( "@", 0,
 	      "(R", "REMOTE",
@@ -55,37 +69,64 @@ $atend = 0;
 	      "\001", 22
 	  );
 
+map {
+    my ($xchar) = pack("C", $_);
+    if ($_ >= 32 && $_ < 127) {
+	$chartable{$xchar} = " $xchar";
+	$xchartable{$xchar} = " *$xchar";
+	$rchartable{$xchar} = $xchar;
+    } else {
+	$chartable{$xchar} = sprintf("%02x", $_);
+	$xchartable{$xchar} = sprintf("*%02x", $_);
+	$rchartable{$xchar} = sprintf("%02x ", $_);
+    }
+    $nchartable{$xchar} = $_;
+} (0..255);
+
+@seqkeys = (sort { length $b <=> length $a } keys %seqtable);
+
+map { $keylengths{$_} = length $_ } @seqkeys;
+
 $esc = "\033";
 
 $curpos = 0;
+$curoffset = 0;
 
 $page_mgmt_unit = 360;
 $horizontal_unit = 180;
 $vertical_unit = 360;
 
+$initial_vertical_position = 0;
 $vertical_position = 0;
 $horizontal_position = 0;
 $print_offsets = 0;
+$total_length = 0;
 
-sub get_stuff($) {
+sub fill_buffer($) {
     my ($where) = @_;
-    my ($end) = length $stuff;
+    return 1 if $total_length - $curoffset >= $where;
+    my ($end) = $total_length - $curoffset;
     if ($curpos == 0 && $end == 0) {
 	$stuff = <>;		# Need to do this once to "activate" ARGV
-	$end = length $stuff;
+	$total_length = length $stuff;
+	$end = $total_length - $curoffset;
     }
-    my ($old_end) = length $stuff;
+    my ($old_end) = $end;
     my ($tmp);
-    my ($bytes_to_read) = 4096;
+    my ($bytes_to_read) = 16384;
     if ($where - $end > $bytes_to_read) {
 	$bytes_to_read = $where - $end;
     }
+    if ($curoffset >= 16384) {
+	substr($stuff, 0, $curoffset) = "";
+	$total_length -= $curoffset;
+	$curoffset = 0;
+    }
     while ($end < $where) {
 	my $foo = read ARGV, $tmp, $bytes_to_read;
-#	print STDERR length $tmp, " ", length $stuff, " $curpos $where $bytes_to_read $foo $!", "\n";
 	$stuff .= $tmp;
-#	print STDERR length $tmp, " ", length $stuff, " $curpos $where $bytes_to_read $foo $!", "\n\n";
-	$end = length $stuff;
+	$end += $foo;
+	$total_length += $foo;
 	if ($old_end == $end) {
 	    $atend = 1;
 	    return 0;
@@ -99,8 +140,18 @@ sub get_stuff($) {
 
 sub increment_curpos($) {
     my ($curpos_increment) = @_;
-    substr($stuff, 0, $curpos_increment) = "";
     $curpos += $curpos_increment;
+    $curoffset += $curpos_increment;
+}
+
+# This slows things down tremendously...
+sub xdata($;$) {
+    my ($start, $end) = @_;
+    if (defined $end) {
+	return substr($stuff, $start + $curoffset, $end);
+    } else {
+	return substr($stuff, $start + $curoffset);
+    }
 }
 
 sub do_remote_command() {
@@ -108,73 +159,54 @@ sub do_remote_command() {
     printf "%08x  ", $curpos;
     print "1b  (  R ";
     increment_curpos(3);
-    get_stuff(2);
-    my $lchar = substr($stuff, 0, 1);
-    my $nlchar = unpack("C", $lchar);
-    my $hchar = substr($stuff, 1, 1);
-    my $nhchar = unpack("C", $hchar);
-    printf "%02x %02x ", $nlchar, $nhchar;
+    fill_buffer(2);
+    my $lchar = substr($stuff, $curoffset + 0, 1);
+    my $nlchar = $nchartable{$lchar};
+    my $hchar = substr($stuff, $curoffset + 1, 1);
+    my $nhchar = $nchartable{$hchar};
+    printf " %02x %02x ", $nlchar, $nhchar;
     my $skipchars = ($nhchar * 256) + $nlchar;
     increment_curpos(2);
-    my $i;
-    my $char;
-    my $nchar;
-    get_stuff($skipchars);
-    for ($i = 0; $i < $skipchars; $i++) {
-	$char = substr($stuff, $i, 1);
-	$nchar = unpack("C", $char);
-	if ($nchar >= 32 && $nchar < 127) {
-	    print $char;
-	} else {
-	    printf "%02x ", $nchar;
-	}
+    fill_buffer($skipchars);
+    for (my $i = 0; $i < $skipchars; $i++) {
+	print $rchartable{substr($stuff, $curoffset + $i, 1)};
     }
     increment_curpos($skipchars);
-    while (get_stuff(2) &&
-	   substr($stuff, 0, 2) =~ /[A-Z0-9][A-Z0-9]/) {
+    while (fill_buffer(2) &&
+	   substr($stuff, $curoffset + 0, 2) =~ /[A-Z0-9][A-Z0-9]/) {
 	print "\n";
 	printf "%08x    ", $curpos;
-	my ($cmd) = substr($stuff, 0, 2);
+	my ($cmd) = substr($stuff, $curoffset + 0, 2);
 	print $cmd;
 	increment_curpos(2);
-	get_stuff(2);
-	$lchar = substr($stuff, 0, 1);
-	$nlchar = unpack("C", $lchar);
-	$hchar = substr($stuff, 1, 1);
-	$nhchar = unpack("C", $hchar);
+	fill_buffer(2);
+	$lchar = substr($stuff, $curoffset + 0, 1);
+	$nlchar = $nchartable{$lchar};
+	$hchar = substr($stuff, $curoffset + 1, 1);
+	$nhchar = $nchartable{$hchar};
 	if ($cmd eq "DF") {
 	    $skipchars = 0;
 	} else {
 	    $skipchars = ($nhchar * 256) + $nlchar;
 	}
-	printf "%02x %02x ", $nlchar, $nhchar;
+	printf " %02x %02x ", $nlchar, $nhchar;
 	increment_curpos(2);
-	get_stuff($skipchars);
-	for ($i = 0; $i < $skipchars; $i++) {
-	    printf "%02x ", unpack("C", substr($stuff, $i, 1));
-	}
+	fill_buffer($skipchars);
+	printf "%*v02x ", " ", substr($stuff, $curoffset, $skipchars);
 	increment_curpos($skipchars);
     }
 }
 
-sub print_prefix_bytes($) {
+sub print_prefix_bytes($$) {
     my ($bytes_to_print) = @_;
     print "\n";
     printf "%08x  ", $curpos;
     print "1b ";
-    my $i;
-    my $char;
-    my $nchar;
-    get_stuff($bytes_to_print);
-    for ($i = 1; $i < $bytes_to_print; $i++) {
-	$char = substr($stuff, $i, 1);
-	$nchar = unpack("C", $char);
-	if ($i < 2 && $nchar >= 32 && $nchar < 127) {
-	    print " $char ";
-	} else {
-	    printf "%02x ", unpack("C", $char);
-	}
-    }
+    fill_buffer($bytes_to_print);
+    my $char = substr($stuff, $curoffset + 1, 1);
+    print "$chartable{$char} ";
+    printf "%*v02x ", " ", substr($stuff, $curoffset + 2, $bytes_to_print - 2);
+    increment_curpos($bytes_to_print);
 }
 
 sub print_output_data($$$$$$) {
@@ -193,25 +225,25 @@ sub print_output_data($$$$$$) {
     }
     my $savedots = $dots;
     if ($comptype == 0) {
+	fill_buffer($dots / 8);
 	if ($opt_V) {
-	    get_stuff($dots);
-	    printf "%*v02x ", " ", substr($stuff, 0, $dots);
+	    printf "%*v02x ", " ", substr($stuff, $curoffset + 0, $dots / 8);
 	}
-	increment_curpos($dots);
+	increment_curpos($dots / 8);
     } elsif ($comptype == 1) {
 	foreach $i (0..$rows-1) {
 	    my ($found_something) = 0;
 	    $dots = $savedots;
-	    my ($tstuff) = "\n    $i    ";;
+	    my ($tstuff) = "\n    $i    ";
 	    while ($dots > 0) {
-		get_stuff(1);
-		$counter = ord(substr($stuff, 0, 1));
+		fill_buffer(1);
+		$counter = ord(substr($stuff, $curoffset + 0, 1));
 		increment_curpos(1);
 		if ($counter <= 127) {
 		    $counter++;
-		    get_stuff($counter);
+		    fill_buffer($counter);
 		    if ($opt_v || $opt_V) {
-			my $tmp = sprintf "%*v02x ", " ", substr($stuff, 0, $counter);
+			my $tmp = sprintf "%*v02x ", " ", substr($stuff, $curoffset + 0, $counter);
 			if (!($tmp =~ /^[0 ]+$/)) {
 			    $found_something = 1;
 			    $last_row = $i;
@@ -226,9 +258,9 @@ sub print_output_data($$$$$$) {
 		    increment_curpos($counter);
 		} else {
 		    $counter = 257 - $counter;
-		    get_stuff(1);
+		    fill_buffer(1);
 		    if ($opt_v || $opt_V) {
-			$fchar = sprintf "%v02x ", substr($stuff, 0, 1);
+			$fchar = sprintf "%v02x ", substr($stuff, $curoffset + 0, 1);
 			if ($fchar ne "00 ") {
 			    $found_something = 1;
 			    $last_row = $i;
@@ -248,63 +280,63 @@ sub print_output_data($$$$$$) {
 		$vstuff .= $tstuff;
 	    }
 	}
-	if ($opt_v) {
-	    my ($offset) = $offsets[$color];
-	    my ($first_position) = ($vertical_position / $vertical_unit)
-		+ ($first_row + $offset) * $raster_y;
-	    my ($last_position) = ($vertical_position / $vertical_unit)
-		+ ($last_row + $offset) * $raster_y;
-	    my ($final_position) = ($vertical_position / $vertical_unit)
-		+ ($rows + $offset) * $raster_y;
-	    my ($final_horizontal) = $horizontal_position +
-		($real_dots * $page_mgmt_unit * $raster_x);
-	    if ($print_offsets) {
-		printf (" %d,%d+%d %.4f  %d,%d+%d %.4f  %.4f) ",
-			$horizontal_position, $first_row, $offset, $first_position,
-			$final_horizontal, $last_row, $offset, $last_position,
-			$final_position);
-	    } else {
-		printf (" %d,%d %.4f  %d,%d %.4f  %.4f) ",
-			$horizontal_position, $first_row, $first_position,
-			$final_horizontal, $last_row, $last_position,
-			$final_position);
-	    }
-	}
-	if ($opt_V) {
-	    print " $vstuff";
-	}
     } else {
 	print "\nUnknown compression type $comptype!\n";
     }
+    if ($opt_v) {
+	my ($offset) = $offsets[$color];
+	my ($first_position) = ($vertical_position / $vertical_unit)
+	    + ($first_row + $offset) * $raster_y;
+	my ($last_position) = ($vertical_position / $vertical_unit)
+	    + ($last_row + $offset) * $raster_y;
+	my ($final_position) = ($vertical_position / $vertical_unit)
+	    + ($rows + $offset) * $raster_y;
+	my ($final_horizontal) = $horizontal_position +
+	    ($real_dots * $page_mgmt_unit * $raster_x);
+	if ($print_offsets) {
+	    printf (" %d,%d+%d %.4f  %d,%d+%d %.4f  %.4f) ",
+		    $horizontal_position, $first_row, $offset, $first_position,
+		    $final_horizontal, $last_row, $offset, $last_position,
+		    $final_position);
+	} else {
+	    printf (" %d,%d %.4f  %d,%d %.4f  %.4f) ",
+		    $horizontal_position, $first_row, $first_position,
+		    $final_horizontal, $last_row, $last_position,
+		    $final_position);
+	}
+    }
+    if ($opt_V) {
+	print " $vstuff";
+    }
 }
 
 sub do_special_command() {
-    get_stuff(8);
-    my $comptype = unpack("C", substr($stuff, 2, 1));
+    fill_buffer(8);
+    my $comptype = $nchartable{substr($stuff, $curoffset + 2, 1)};
     my $color = 0;
-    my $dots = unpack("v", substr($stuff, 6, 2));
-    my $rows = unpack("C", substr($stuff, 5, 1));
-    print_prefix_bytes(8);
-    increment_curpos(8);
+    my $dots = unpack("v", substr($stuff, $curoffset + 6, 2));
+    my $rows = $nchartable{substr($stuff, $curoffset + 5, 1)};
+    print_prefix_bytes(8, 2);
     print_output_data($comptype, 1, $dots, $rows, 8, $color);
-    get_stuff(1);
-    while (substr($stuff, 0, 1) eq "\r") {
+    fill_buffer(1);
+    while (substr($stuff, $curoffset + 0, 1) eq "\r") {
+	fill_buffer(1);
 	increment_curpos(1);
     }
 }
 
 sub do_special1_command() {
-    get_stuff(9);
-    my $color = unpack("C", substr($stuff, 2, 1));
-    my $comptype = unpack("C", substr($stuff, 3, 1));
-    my $bitsperpixel = unpack("C", substr($stuff, 4, 1));
-    my $dots = unpack("v", substr($stuff, 5, 2));
-    my $rows = unpack("v", substr($stuff, 7, 2));
-    print_prefix_bytes(9);
-    increment_curpos(9);
+    fill_buffer(9);
+    my $color = $nchartable{substr($stuff, $curoffset + 2, 1)};
+    my $comptype = $nchartable{substr($stuff, $curoffset + 3, 1)};
+    my $bitsperpixel = $nchartable{substr($stuff, $curoffset + 4, 1)};
+    my $dots = unpack("v", substr($stuff, $curoffset + 5, 2));
+    my $rows = unpack("v", substr($stuff, $curoffset + 7, 2));
+    print_prefix_bytes(9, 1);
     print_output_data($comptype, $bitsperpixel, $dots, $rows, 1, $color);
-    get_stuff(1);
-    while (substr($stuff, 0, 1) eq "\r") {
+    fill_buffer(1);
+    while (substr($stuff, $curoffset + 0, 1) eq "\r") {
+	fill_buffer(1);
 	increment_curpos(1);
     }
 }
@@ -331,13 +363,13 @@ sub get_short($) {
 
 sub get_byte($) {
     my ($string) = @_;
-    return unpack("C", $string);
+    return $nchartable{$string};
 }
 
 if ($opt_O) {
-    my (@stuff) = split /,/, $opt_O;
+    my (@stuff) = split(/,/, $opt_O);
     map {
-	my ($key, $val) = split /=/;
+	my ($key, $val) = split(/=/, $_);
 	if ($val) {
 	    $print_offsets = 1;
 	}
@@ -360,12 +392,15 @@ while (! $atend) {
     my $char;
     my $nchar;
     my $bytes;
-    get_stuff(2);
-    if (substr($stuff, 0, 1) eq "$esc") {
+    my ($maxklen) = $keylengths{$seqkeys[0]};
+    fill_buffer(1);
+    my $cchar = substr($stuff, $curoffset + 0, 1);
+    if ($cchar eq "$esc") {
 	$found = 0;
-	foreach $key (sort { length $b <=> length $a } keys %seqtable) {
-	    get_stuff(1 + length $key);
-	    if (substr($stuff, 1, length $key) eq $key) {
+	fill_buffer(2 + $maxklen);
+	foreach $key (@seqkeys) {
+	    my ($klen) = $keylengths{$key};
+	    if (substr($stuff, $curoffset + 1, $klen) eq $key) {
 		$skipchars = $seqtable{$key};
 		if ($skipchars eq "SPECIAL") {
 		    do_special_command();
@@ -382,77 +417,89 @@ while (! $atend) {
 		    print "1b ";
 		    $startoff = 0;
 		    my $print_stuff = 0;
+		    my $print_variable = 0;
 		    if ($skipchars eq "VARIABLE") {
-			get_stuff((length $key) + 3);
-			$kchar = substr($stuff, (length $key) + 1, 1);
+			fill_buffer(3);
+			$print_variable = 1;
+			$kchar = substr($stuff, $curoffset + $klen + 1, 1);
 			$nkchar = unpack("C", $kchar);
-			$lchar = substr($stuff, (length $key) + 2, 1);
+			$lchar = substr($stuff, $curoffset + $klen + 2, 1);
 			$nlchar = unpack("C", $lchar);
-			$hchar = substr($stuff, (length $key) + 3, 1);
+			$hchar = substr($stuff, $curoffset + $klen + 3, 1);
 			$nhchar = unpack("C", $hchar);
 			$skipchars = ($nhchar * 256) + $nlchar;
 			$startoff = 3;
 			$print_stuff = 1;
 		    }
-		    get_stuff($skipchars + (length $key) + $startoff + 1);
-		    for ($i = 0;
-			 $i < $skipchars + (length $key) + $startoff;
-			 $i++) {
-			$char = substr($stuff, $i + 1, 1);
-			$nchar = unpack("C", $char);
-			if ($i < 3 && $nchar >= 32 && $nchar < 127) {
-			    print " $char ";
-			} else {
-			    printf "%02x ", unpack("C", $char);
+		    my ($blen) = $skipchars + $klen + $startoff;
+		    fill_buffer($blen + 1);
+		    $char = substr($stuff, $curoffset + 1, 1);
+		    print "$chartable{$char} ";
+		    if ($blen > 1) {
+			$char = substr($stuff, $curoffset + 2, 1);
+			print "$chartable{$char} ";
+			if ($blen > 2) {
+			    if ($print_variable && $char eq "d") {
+				printf ("%*v02x ", " ",
+					substr($stuff, $curoffset + 3, 2));
+			    } else {
+				printf ("%*v02x ", " ",
+					substr($stuff, $curoffset + 3, $blen - 2));
+			    }
 			}
 		    }
 		    if ($print_stuff) {
-			my $xchar = substr($stuff, 2, 1);
+			my $xchar = substr($stuff, $curoffset + 2, 1);
 			if ($xchar eq "c") {
 			    my ($top, $bottom);
 			    if ($skipchars == 8) {
-				$top = get_long(substr($stuff, 5, 4));
-				$bottom = get_long(substr($stuff, 9, 4));
+				$top = get_long(substr($stuff, $curoffset + 5, 4));
+				if ($opt_v) {
+				    $bottom = get_long(substr($stuff, $curoffset + 9, 4));
+				}
 			    } else {
-				$top = get_short(substr($stuff, 5, 2));
-				$bottom = get_short(substr($stuff, 7, 2));
+				$top = get_short(substr($stuff, $curoffset + 5, 2));
+				if ($opt_v) {
+				    $bottom = get_short(substr($stuff, $curoffset + 7, 2));
+				}
 			    }
 			    if ($opt_v) {
 				printf (" (page format %d %d %.2f %.2f)",
 					$top, $bottom, $top / $page_mgmt_unit,
 					$bottom / $page_mgmt_unit);
 			    }
-			    $vertical_position =
+			    $initial_vertical_position =
 				$top * $vertical_unit / $page_mgmt_unit;
+			    $vertical_position = $initial_vertical_position;
 			} elsif ($xchar eq "S") {
-			    my ($width, $height);
-			    if ($skipchars == 8) {
-				$width = get_long(substr($stuff, 5, 4));
-				$height = get_long(substr($stuff, 9, 4));
-			    } else {
-				$width = get_short(substr($stuff, 5, 2));
-				$height = get_short(substr($stuff, 7, 2));
-			    }
 			    if ($opt_v) {
+				my ($width, $height);
+				if ($skipchars == 8) {
+				    $width = get_long(substr($stuff, $curoffset + 5, 4));
+				    $height = get_long(substr($stuff, $curoffset + 9, 4));
+				} else {
+				    $width = get_short(substr($stuff, $curoffset + 5, 2));
+				    $height = get_short(substr($stuff, $curoffset + 7, 2));
+				}
 				printf (" (paper size %d %d %.2f %.2f)",
 					$width, $height, $width / $page_mgmt_unit,
 					$height / $page_mgmt_unit);
 			    }
 			} elsif ($xchar eq "C") {
-			    my ($length);
-			    if ($skipchars == 4) {
-				$length = get_long(substr($stuff, 5, 4));
-			    } else {
-				$length = get_short(substr($stuff, 5, 2));
-			    }
 			    if ($opt_v) {
+				my ($length);
+				if ($skipchars == 4) {
+				    $length = get_long(substr($stuff, $curoffset + 5, 4));
+				} else {
+				    $length = get_short(substr($stuff, $curoffset + 5, 2));
+				}
 				printf (" (page length %d %.2f)",
 					$length, $length / $page_mgmt_unit);
 			    }
 			} elsif ($xchar eq "D") {
-			    my $base = get_short(substr($stuff, 5, 2));
-			    my $y = get_byte(substr($stuff, 7, 1));
-			    my $x = get_byte(substr($stuff, 8, 1));
+			    my $base = get_short(substr($stuff, $curoffset + 5, 2));
+			    my $y = $nchartable{substr($stuff, $curoffset + 7, 1)};
+			    my $x = $nchartable{substr($stuff, $curoffset + 8, 1)};
 			    $raster_x = $x / $base;
 			    $raster_y = $y / $base;
 			    if ($opt_v) {
@@ -461,10 +508,10 @@ while (! $atend) {
 			    }
 			} elsif ($xchar eq "U") {
 			    if ($skipchars == 5) {
-				my $page_mgmt = get_byte(substr($stuff, 5, 1));
-				my $vertical = get_byte(substr($stuff, 6, 1));
-				my $horiz = get_byte(substr($stuff, 7, 1));
-				my $scale = get_short(substr($stuff, 8, 2));
+				my $page_mgmt = $nchartable{substr($stuff, $curoffset + 5, 1)};
+				my $vertical = $nchartable{substr($stuff, $curoffset + 6, 1)};
+				my $horiz = $nchartable{substr($stuff, $curoffset + 7, 1)};
+				my $scale = get_short(substr($stuff, $curoffset + 8, 2));
 				$page_mgmt_unit = $scale / $page_mgmt;
 				$horizontal_unit = $scale / $horiz;
 				$vertical_unit = $scale / $vertical;
@@ -474,20 +521,20 @@ while (! $atend) {
 					    $vertical_unit, $horizontal_unit);
 				}
 			    } else {
-				my $page_mgmt = get_byte(substr($stuff, 5, 1));
+				my $page_mgmt = $nchartable{substr($stuff, $curoffset + 5, 1)};
 				if ($opt_v) {
-				    printf " (units base = %d/720)", $page_mgmt;
+				    printf " (units base = %d/3600)", $page_mgmt;
 				}
-				$page_mgmt_unit = $page_mgmt;
-				$horizontal_unit = $page_mgmt;
-				$vertical_unit = $page_mgmt;
+				$page_mgmt_unit = 3600 / $page_mgmt;
+				$horizontal_unit = 3600 / $page_mgmt;
+				$vertical_unit = 3600 / $page_mgmt;
 			    }
 			} elsif ($xchar eq "v") {
 			    my ($length);
 			    if ($skipchars == 4) {
-				$length = get_long(substr($stuff, 5, 4));
+				$length = get_long(substr($stuff, $curoffset + 5, 4));
 			    } else {
-				$length = get_short(substr($stuff, 5, 2));
+				$length = get_short(substr($stuff, $curoffset + 5, 2));
 			    }
 			    $vertical_position += $length;
 			    if ($opt_v) {
@@ -496,24 +543,25 @@ while (! $atend) {
 					$vertical_position / $vertical_unit);
 			    }
 			} elsif ($xchar eq "\$") {
-			    my ($length);
 			    if ($skipchars == 4) {
 				$horizontal_position =
-				    get_long(substr($stuff, 5, 4));
+				    get_long(substr($stuff, $curoffset + 5, 4));
 			    } else {
 				$horizontal_position =
-				    get_short(substr($stuff, 5, 2));
+				    get_short(substr($stuff, $curoffset + 5, 2));
 			    }
 			    if ($opt_v) {
 				printf (" (horizontal position %d %.4f)",
 					$horizontal_position,
 					$horizontal_position / $horizontal_unit);
 			    }
+			} elsif ($xchar eq "d") {
+			    printf " (nop)";
 			}
 		    }
 		    $found = 1;
 		}
-		$bytes = length($key) + 1 + $skipchars + $startoff;
+		$bytes = $klen + 1 + $skipchars + $startoff;
 		last;
 	    }
 	}
@@ -525,29 +573,16 @@ while (! $atend) {
 	} elsif ($found == 1) {
 	    increment_curpos($bytes);
 	}
-    } elsif (substr($stuff, 0, 1) eq "\0" ||
-	     substr($stuff, 0, 1) eq "\f") {
-	get_stuff(1);
-	$char = substr($stuff, 0, 1);
-	$nchar = unpack("C", $char);
-	if ($nchar >= 32 && $nchar < 127) {
-	    print " $char ";
-	} else {
-	    printf "%02x ", unpack("C", $char);
-	}
+    } elsif ($cchar eq "\0" || $cchar eq "\f") {
+	printf "\n%08x  ", $curpos;
+	print "$chartable{$cchar} ";
+	$vertical_position = $initial_vertical_position;
 	increment_curpos(1);
     } else {
-	get_stuff(1);
-	$char = substr($stuff, 0, 1);
-	$nchar = unpack("C", $char);
-	if ($nchar >= 32 && $nchar < 127) {
-	    print " *$char ";
-	} else {
-	    printf "*%02x ", unpack("C", $char);
-	}
+	print "$xchartable{$cchar} " if ($cchar ne "\021");
 	increment_curpos(1);
     }
 }
 
-print "\n";
+print "\n" if $curpos > 1;
 
diff --git a/test/run-testdither b/test/run-testdither
index eb24b6c..1ae0db3 100755
--- a/test/run-testdither
+++ b/test/run-testdither
@@ -3,7 +3,7 @@
 out_status=0
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../src/main
+    STP_DATA_PATH=`pwd`/../src/xml
     export STP_DATA_PATH
 fi
 
diff --git a/test/run-weavetest b/test/run-weavetest
index f87315e..e3bf2db 100755
--- a/test/run-weavetest
+++ b/test/run-weavetest
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$STP_DATA_PATH" ] ; then
-    STP_DATA_PATH=`pwd`/../src/main
+    STP_DATA_PATH=`pwd`/../src/xml
     export STP_DATA_PATH
 fi
 
@@ -13,7 +13,7 @@ fi
 passes='1,1,1 2,1,1 1,2,1 1,2,2 1,4,1 4,1,1 4,2,1 2,2,1 1,4,2 2,2,2 2,4,2 8,1,1 4,4,2 8,2,1 16,1,1'
 
 # All numbers of jets used by any printer.
-jets='1 2 4 8 15 16 20 21 24 29 32 47 48 59 60 64 90 96 128 144 180 192 208 360'
+jets='1 2 4 8 15 16 20 21 24 29 32 47 48 59 60 64 90 96 128 144 180 192 208 358 360 384'
 
 # All nozzle separations used by any printer at any resolution.
 separations='1 2 3 4 6 8 12 16 24'
@@ -27,11 +27,11 @@ strategies='0 1 2 3 4'
 arrangements='0 1 2 3'
 
 # Set to the largest possible multiple of the number of heads and
-# the nozzle separation.  At present, the PM-970C has 360 heads spaced
+# the nozzle separation.  At present, the WorkForce 40 has 384 heads spaced
 # 1/360" apart, with a maximum resolution of 2880x2880.  There's no
 # point right now in testing anything higher than this, and it's very
 # time consuming.
-head_limit=2880
+head_limit=3072
 
 if [ $# -eq 0 ] ; then
     QUIET=1
diff --git a/test/unprint.c b/test/unprint.c
index 4422596..cef064b 100644
--- a/test/unprint.c
+++ b/test/unprint.c
@@ -1,4 +1,4 @@
-/* $Id: unprint.c,v 1.39 2008/01/27 21:28:08 rlk Exp $ */
+/* $Id: unprint.c,v 1.42 2008/07/18 02:03:48 rlk Exp $ */
 /*
  * Generate PPM files from printer output
  *
@@ -87,7 +87,7 @@ typedef struct {
  * actually read in the data.  This optimization may be worthwhile.
  */
 
-#define MAX_INKS 12
+#define MAX_INKS 20
 typedef struct {
    unsigned char *line[MAX_INKS];
    int startx[MAX_INKS];
@@ -115,10 +115,10 @@ line_type **page=NULL;
 
 /* Color Codes:
    color    Epson1  Epson2   Sequential
-   Black    0       0        0
-   Magenta  1       1        1
-   Cyan     2       2        2
-   Yellow   4       4        3
+   Black    0       0        0/16
+   Magenta  1       1        1/17
+   Cyan     2       2        2/18
+   Yellow   4       4        3/19
    L.Mag.   17      257      4
    L.Cyan   18      258      5
    L.Black  16      256      6
@@ -128,6 +128,7 @@ line_type **page=NULL;
    P.Black  64      N/A      0
    Gloss    9       N/A      10
    LL.Black 48      768      11
+   Orange   10       N/A     12
  */
 
 /* convert either Epson1 or Epson2 color encoding into a sequential encoding */
@@ -137,7 +138,6 @@ seqcolor(int c)
   switch (c)
     {
     case 0:
-    case 64:
       return 0;
     case 1:
       return 1;
@@ -166,6 +166,16 @@ seqcolor(int c)
     case 48:
     case 768:
       return 11;
+    case 10:
+      return 12;
+    case 64:
+      return 16;
+    case 65:
+      return 17;
+    case 66:
+      return 18;
+    case 68:
+      return 19;
     default:
       return 0;
     }
@@ -273,18 +283,27 @@ set_bits(unsigned char *p,int idx,int value)
 }
 
 static float ink_colors[MAX_INKS][4] =
-{{ 0,   0,  0,  1 },		/* K */
- { 1,  .1,  1,  1 },		/* M */
- { .1, .7, .7,  1 },		/* C */
- { 1,   1, .1,  1 },		/* Y */
- { 1,  .7,  1,  1 },		/* m */
- { .4,  1,  1,  1 },		/* c */
- { .7, .7, .7,  1 },		/* k */
- { .7, .7,  0,  1 },		/* dY */
- { 1,   0,  0,  1 },		/* R */
- { 0,   0,  1,  1 },		/* B */
- { 1,   1,  1,  1 },		/* Gloss */
- { .8, .8, .8,  1 },		/* llk */
+/* C(R) M(G) Y(B) K(W) */
+{{ 0,   0,   0,   1 },		/* 0  K */
+ { 1,    .1, 1,   1 },		/* 1  M */
+ {  .1, 1,   1,   1 },		/* 2  C */
+ { 1,   1,    .1, 1 },		/* 3  Y */
+ { 1,    .7, 1,   1 },		/* 4  m */
+ {  .4, 1,   1,   1 },		/* 5  c */
+ {  .7,  .7,  .7, 1 },		/* 6  k */
+ {  .7,  .7, 0,   1 },		/* 7  dY */
+ { 1,   0,   0,   1 },		/* 8  R */
+ { 0,   0,   1,   1 },		/* 8  B */
+ { 1,   1,   1,   1 },		/* 10 Gloss */
+ {  .8,  .8,  .8, 1 },		/* 11 llk */
+ {  .9,  .3, 0,   1 },		/* 12 Orange */
+ { 0,   0,   0,   1 },		/* 13 K */
+ { 0,   0,   0,   1 },		/* 14 K */
+ { 0,   0,   0,   1 },		/* 15 K */
+ { 0,   0,   0,   1 },		/* 16 K */
+ { 1,    .1, 1,   1 },		/* 17 M */
+ {  .1, 1,   1,   1 },		/* 18 C */
+ { 1,   1,    .1, 1 },		/* 19 Y */
 };
 
 static float quadtone_inks[] = { 0.0, .25, .5, .75 };
@@ -1040,6 +1059,7 @@ parse_escp2_extended(FILE *fp_r)
 
       break;
     case 's':		/* Set print speed */
+    case 'm':		/* Set paper type */
       break;
     case 'S': /* set paper dimensions */
       switch (bufsize)
diff --git a/test/xml-curve.c b/test/xml-curve.c
index f896971..6bebf3a 100644
--- a/test/xml-curve.c
+++ b/test/xml-curve.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml-curve.c,v 1.6 2004/09/17 18:38:28 rleigh Exp $"
+ * "$Id: xml-curve.c,v 1.7 2008/08/02 15:10:56 rleigh Exp $"
  *
  *   Copyright 2002 Robert Krawitz (rlk@alum.mit.edu)
  *
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
   stp_init();
 
 #ifdef DEBUG
-  fprintf(stderr, "stp-xml-parse: reading  `%s'...\n", file);
+  fprintf(stderr, "stp-xml-parse: reading  `%s'...\n", argv[1]);
 #endif
 
   fprintf(stderr, "Using file: %s\n", argv[1]);